Page MenuHomeFreeBSD
Files F171205805

D19512.id54859.diff
No OneTemporary
Actions

D19512.id54859.diff
View Options

Index: sys/fs/nfsclient/nfs_clvnops.c
===================================================================
--- sys/fs/nfsclient/nfs_clvnops.c
+++ sys/fs/nfsclient/nfs_clvnops.c
@@ -3511,9 +3511,6 @@
case _PC_NO_TRUNC:
*ap->a_retval = pc.pc_notrunc;
break;
- case _PC_ACL_EXTENDED:
- *ap->a_retval = 0;
- break;
case _PC_ACL_NFS4:
if (NFS_ISV4(vp) && nfsrv_useacl != 0 && attrflag != 0 &&
NFSISSET_ATTRBIT(&nfsva.na_suppattr, NFSATTRBIT_ACL))
@@ -3527,9 +3524,6 @@
else
*ap->a_retval = 3;
break;
- case _PC_MAC_PRESENT:
- *ap->a_retval = 0;
- break;
case _PC_PRIO_IO:
*ap->a_retval = 0;
break;
Index: sys/kern/vfs_default.c
===================================================================
--- sys/kern/vfs_default.c
+++ sys/kern/vfs_default.c
@@ -482,6 +482,13 @@
case _PC_PATH_MAX:
*ap->a_retval = PATH_MAX;
return (0);
+ case _PC_ACL_EXTENDED:
+ case _PC_ACL_NFS4:
+ case _PC_CAP_PRESENT:
+ case _PC_INF_PRESENT:
+ case _PC_MAC_PRESENT:
+ *ap->a_retval = 0;
+ return (0);
default:
return (EINVAL);
}
Index: sys/ufs/ufs/ufs_vnops.c
===================================================================
--- sys/ufs/ufs/ufs_vnops.c
+++ sys/ufs/ufs/ufs_vnops.c
@@ -2421,28 +2421,20 @@
case _PC_NO_TRUNC:
*ap->a_retval = 1;
break;
- case _PC_ACL_EXTENDED:
#ifdef UFS_ACL
+ case _PC_ACL_EXTENDED:
if (ap->a_vp->v_mount->mnt_flag & MNT_ACLS)
*ap->a_retval = 1;
else
*ap->a_retval = 0;
-#else
- *ap->a_retval = 0;
-#endif
break;
-
case _PC_ACL_NFS4:
-#ifdef UFS_ACL
if (ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS)
*ap->a_retval = 1;
else
*ap->a_retval = 0;
-#else
- *ap->a_retval = 0;
-#endif
break;
-
+#endif
case _PC_ACL_PATH_MAX:
#ifdef UFS_ACL
if (ap->a_vp->v_mount->mnt_flag & (MNT_ACLS | MNT_NFS4ACLS))
@@ -2453,16 +2445,14 @@
*ap->a_retval = 3;
#endif
break;
- case _PC_MAC_PRESENT:
#ifdef MAC
+ case _PC_MAC_PRESENT:
if (ap->a_vp->v_mount->mnt_flag & MNT_MULTILABEL)
*ap->a_retval = 1;
else
*ap->a_retval = 0;
-#else
- *ap->a_retval = 0;
-#endif
break;
+#endif
case _PC_MIN_HOLE_SIZE:
*ap->a_retval = ap->a_vp->v_mount->mnt_stat.f_iosize;
break;

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 10, 12:37 PM (5 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38646145
Default Alt Text
D19512.id54859.diff (2 KB)

Event Timeline