Page MenuHomeFreeBSD

D11541.id30595.diff
No OneTemporary

D11541.id30595.diff

Index: sys/fs/cd9660/cd9660_vnops.c
===================================================================
--- sys/fs/cd9660/cd9660_vnops.c
+++ sys/fs/cd9660/cd9660_vnops.c
@@ -792,20 +792,11 @@
else
*ap->a_retval = 37;
return (0);
- case _PC_PATH_MAX:
- *ap->a_retval = PATH_MAX;
- return (0);
- case _PC_PIPE_BUF:
- *ap->a_retval = PIPE_BUF;
- return (0);
- case _PC_CHOWN_RESTRICTED:
- *ap->a_retval = 1;
- return (0);
case _PC_NO_TRUNC:
*ap->a_retval = 1;
return (0);
default:
- return (EINVAL);
+ return (vop_stdpathconf(ap));
}
/* NOTREACHED */
}
Index: sys/fs/ext2fs/ext2_vnops.c
===================================================================
--- sys/fs/ext2fs/ext2_vnops.c
+++ sys/fs/ext2fs/ext2_vnops.c
@@ -1586,18 +1586,6 @@
case _PC_LINK_MAX:
*ap->a_retval = EXT2_LINK_MAX;
break;
- case _PC_NAME_MAX:
- *ap->a_retval = NAME_MAX;
- break;
- case _PC_PATH_MAX:
- *ap->a_retval = PATH_MAX;
- break;
- case _PC_PIPE_BUF:
- *ap->a_retval = PIPE_BUF;
- break;
- case _PC_CHOWN_RESTRICTED:
- *ap->a_retval = 1;
- break;
case _PC_NO_TRUNC:
*ap->a_retval = 1;
break;
@@ -1616,11 +1604,6 @@
case _PC_MIN_HOLE_SIZE:
*ap->a_retval = ap->a_vp->v_mount->mnt_stat.f_iosize;
break;
- case _PC_ASYNC_IO:
- /* _PC_ASYNC_IO should have been handled by upper layers. */
- KASSERT(0, ("_PC_ASYNC_IO should not get here"));
- error = EINVAL;
- break;
case _PC_PRIO_IO:
*ap->a_retval = 0;
break;
@@ -1650,7 +1633,7 @@
break;
default:
- error = EINVAL;
+ error = vop_stdpathconf(ap);
break;
}
return (error);
Index: sys/fs/fifofs/fifo_vnops.c
===================================================================
--- sys/fs/fifofs/fifo_vnops.c
+++ sys/fs/fifofs/fifo_vnops.c
@@ -71,7 +71,6 @@
static vop_print_t fifo_print;
static vop_open_t fifo_open;
static vop_close_t fifo_close;
-static vop_pathconf_t fifo_pathconf;
static vop_advlock_t fifo_advlock;
struct vop_vector fifo_specops = {
@@ -87,7 +86,7 @@
.vop_mkdir = VOP_PANIC,
.vop_mknod = VOP_PANIC,
.vop_open = fifo_open,
- .vop_pathconf = fifo_pathconf,
+ .vop_pathconf = vop_stdpathconf,
.vop_print = fifo_print,
.vop_read = VOP_PANIC,
.vop_readdir = VOP_PANIC,
@@ -340,34 +339,6 @@
}
/*
- * Return POSIX pathconf information applicable to fifo's.
- */
-static int
-fifo_pathconf(ap)
- struct vop_pathconf_args /* {
- struct vnode *a_vp;
- int a_name;
- int *a_retval;
- } */ *ap;
-{
-
- switch (ap->a_name) {
- case _PC_LINK_MAX:
- *ap->a_retval = LINK_MAX;
- return (0);
- case _PC_PIPE_BUF:
- *ap->a_retval = PIPE_BUF;
- return (0);
- case _PC_CHOWN_RESTRICTED:
- *ap->a_retval = 1;
- return (0);
- default:
- return (EINVAL);
- }
- /* NOTREACHED */
-}
-
-/*
* Fifo advisory byte-level locks.
*/
/* ARGSUSED */
Index: sys/fs/msdosfs/msdosfs_vnops.c
===================================================================
--- sys/fs/msdosfs/msdosfs_vnops.c
+++ sys/fs/msdosfs/msdosfs_vnops.c
@@ -1898,17 +1898,11 @@
case _PC_NAME_MAX:
*ap->a_retval = pmp->pm_flags & MSDOSFSMNT_LONGNAME ? WIN_MAXLEN : 12;
return (0);
- case _PC_PATH_MAX:
- *ap->a_retval = PATH_MAX;
- return (0);
- case _PC_CHOWN_RESTRICTED:
- *ap->a_retval = 1;
- return (0);
case _PC_NO_TRUNC:
*ap->a_retval = 0;
return (0);
default:
- return (EINVAL);
+ return (vop_stdpathconf(ap));
}
/* NOTREACHED */
}
Index: sys/fs/nandfs/nandfs_vnops.c
===================================================================
--- sys/fs/nandfs/nandfs_vnops.c
+++ sys/fs/nandfs/nandfs_vnops.c
@@ -2236,21 +2236,6 @@
error = 0;
switch (ap->a_name) {
- case _PC_LINK_MAX:
- *ap->a_retval = LINK_MAX;
- break;
- case _PC_NAME_MAX:
- *ap->a_retval = NAME_MAX;
- break;
- case _PC_PATH_MAX:
- *ap->a_retval = PATH_MAX;
- break;
- case _PC_PIPE_BUF:
- *ap->a_retval = PIPE_BUF;
- break;
- case _PC_CHOWN_RESTRICTED:
- *ap->a_retval = 1;
- break;
case _PC_NO_TRUNC:
*ap->a_retval = 1;
break;
@@ -2273,7 +2258,7 @@
*ap->a_retval = ap->a_vp->v_mount->mnt_stat.f_iosize;
break;
default:
- error = EINVAL;
+ error = vop_stdpathconf(ap);
break;
}
return (error);
Index: sys/fs/nfsclient/nfs_clvnops.c
===================================================================
--- sys/fs/nfsclient/nfs_clvnops.c
+++ sys/fs/nfsclient/nfs_clvnops.c
@@ -3463,12 +3463,6 @@
case _PC_NAME_MAX:
*ap->a_retval = pc.pc_namemax;
break;
- case _PC_PATH_MAX:
- *ap->a_retval = PATH_MAX;
- break;
- case _PC_PIPE_BUF:
- *ap->a_retval = PIPE_BUF;
- break;
case _PC_CHOWN_RESTRICTED:
*ap->a_retval = pc.pc_chownrestricted;
break;
@@ -3494,11 +3488,6 @@
case _PC_MAC_PRESENT:
*ap->a_retval = 0;
break;
- case _PC_ASYNC_IO:
- /* _PC_ASYNC_IO should have been handled by upper layers. */
- KASSERT(0, ("_PC_ASYNC_IO should not get here"));
- error = EINVAL;
- break;
case _PC_PRIO_IO:
*ap->a_retval = 0;
break;
@@ -3531,7 +3520,7 @@
break;
default:
- error = EINVAL;
+ error = vop_stdpathconf(ap);
break;
}
return (error);
Index: sys/fs/smbfs/smbfs_vnops.c
===================================================================
--- sys/fs/smbfs/smbfs_vnops.c
+++ sys/fs/smbfs/smbfs_vnops.c
@@ -907,7 +907,7 @@
*retval = 800; /* XXX: a correct one ? */
break;
default:
- error = EINVAL;
+ error = vop_stdpathconf(ap);
}
return error;
}
Index: sys/fs/tmpfs/tmpfs_vnops.c
===================================================================
--- sys/fs/tmpfs/tmpfs_vnops.c
+++ sys/fs/tmpfs/tmpfs_vnops.c
@@ -1344,26 +1344,6 @@
error = 0;
switch (name) {
- case _PC_LINK_MAX:
- *retval = LINK_MAX;
- break;
-
- case _PC_NAME_MAX:
- *retval = NAME_MAX;
- break;
-
- case _PC_PATH_MAX:
- *retval = PATH_MAX;
- break;
-
- case _PC_PIPE_BUF:
- *retval = PIPE_BUF;
- break;
-
- case _PC_CHOWN_RESTRICTED:
- *retval = 1;
- break;
-
case _PC_NO_TRUNC:
*retval = 1;
break;
@@ -1377,7 +1357,7 @@
break;
default:
- error = EINVAL;
+ error = vop_stdpathconf(v);
}
return error;
Index: sys/ufs/ufs/ufs_vnops.c
===================================================================
--- sys/ufs/ufs/ufs_vnops.c
+++ sys/ufs/ufs/ufs_vnops.c
@@ -2442,21 +2442,9 @@
error = 0;
switch (ap->a_name) {
- case _PC_LINK_MAX:
- *ap->a_retval = LINK_MAX;
- break;
case _PC_NAME_MAX:
*ap->a_retval = UFS_MAXNAMLEN;
break;
- case _PC_PATH_MAX:
- *ap->a_retval = PATH_MAX;
- break;
- case _PC_PIPE_BUF:
- *ap->a_retval = PIPE_BUF;
- break;
- case _PC_CHOWN_RESTRICTED:
- *ap->a_retval = 1;
- break;
case _PC_NO_TRUNC:
*ap->a_retval = 1;
break;
@@ -2505,11 +2493,6 @@
case _PC_MIN_HOLE_SIZE:
*ap->a_retval = ap->a_vp->v_mount->mnt_stat.f_iosize;
break;
- case _PC_ASYNC_IO:
- /* _PC_ASYNC_IO should have been handled by upper layers. */
- KASSERT(0, ("_PC_ASYNC_IO should not get here"));
- error = EINVAL;
- break;
case _PC_PRIO_IO:
*ap->a_retval = 0;
break;
@@ -2539,7 +2522,7 @@
break;
default:
- error = EINVAL;
+ error = vop_stdpathconf(ap);
break;
}
return (error);

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 12, 5:13 PM (17 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29559756
Default Alt Text
D11541.id30595.diff (6 KB)

Event Timeline