The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=8377575772be0ed37eb42a0b08c684d9fc5c3e18
commit 8377575772be0ed37eb42a0b08c684d9fc5c3e18 Author: Mateusz Guzik <[email protected]> AuthorDate: 2023-02-07 23:03:20 +0000 Commit: Mateusz Guzik <[email protected]> CommitDate: 2023-02-07 23:03:20 +0000 vfs: ansify Reported by: clang 15 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/vfs_default.c | 162 +++++++++---------------------------------------- 1 file changed, 27 insertions(+), 135 deletions(-) diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index d8931a3ae350..ee1310215621 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -237,12 +237,7 @@ vop_panic(struct vop_generic_args *ap) * Default vop for filesystems that do not support name lookup */ static int -vop_nolookup(ap) - struct vop_lookup_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - } */ *ap; +vop_nolookup(struct vop_lookup_args *ap) { *ap->a_vpp = NULL; @@ -501,12 +496,7 @@ vop_stdadvlockpurge(struct vop_advlockpurge_args *ap) * limits. */ int -vop_stdpathconf(ap) - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - int *a_retval; - } */ *ap; +vop_stdpathconf(struct vop_pathconf_args *ap) { switch (ap->a_name) { @@ -534,13 +524,7 @@ vop_stdpathconf(ap) * Standard lock, unlock and islocked functions. */ int -vop_stdlock(ap) - struct vop_lock1_args /* { - struct vnode *a_vp; - int a_flags; - char *file; - int line; - } */ *ap; +vop_stdlock(struct vop_lock1_args *ap) { struct vnode *vp = ap->a_vp; struct mtx *ilk; @@ -552,10 +536,7 @@ vop_stdlock(ap) /* See above. */ int -vop_stdunlock(ap) - struct vop_unlock_args /* { - struct vnode *a_vp; - } */ *ap; +vop_stdunlock(struct vop_unlock_args *ap) { struct vnode *vp = ap->a_vp; @@ -564,10 +545,7 @@ vop_stdunlock(ap) /* See above. */ int -vop_stdislocked(ap) - struct vop_islocked_args /* { - struct vnode *a_vp; - } */ *ap; +vop_stdislocked(struct vop_islocked_args *ap) { return (lockstatus(ap->a_vp->v_vnlock)); @@ -581,13 +559,7 @@ vop_stdislocked(ap) * - v_vnlock pointer is not honored */ int -vop_lock(ap) - struct vop_lock1_args /* { - struct vnode *a_vp; - int a_flags; - char *file; - int line; - } */ *ap; +vop_lock(struct vop_lock1_args *ap) { struct vnode *vp = ap->a_vp; int flags = ap->a_flags; @@ -611,10 +583,7 @@ other: } int -vop_unlock(ap) - struct vop_unlock_args /* { - struct vnode *a_vp; - } */ *ap; +vop_unlock(struct vop_unlock_args *ap) { struct vnode *vp = ap->a_vp; @@ -624,10 +593,7 @@ vop_unlock(ap) } int -vop_islocked(ap) - struct vop_islocked_args /* { - struct vnode *a_vp; - } */ *ap; +vop_islocked(struct vop_islocked_args *ap) { struct vnode *vp = ap->a_vp; @@ -640,13 +606,7 @@ vop_islocked(ap) * Return true for select/poll. */ int -vop_nopoll(ap) - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct ucred *a_cred; - struct thread *a_td; - } */ *ap; +vop_nopoll(struct vop_poll_args *ap) { if (ap->a_events & ~POLLSTANDARD) @@ -658,13 +618,7 @@ vop_nopoll(ap) * Implement poll for local filesystems that support it. */ int -vop_stdpoll(ap) - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct ucred *a_cred; - struct thread *a_td; - } */ *ap; +vop_stdpoll(struct vop_poll_args *ap) { if (ap->a_events & ~POLLSTANDARD) return (vn_pollrecord(ap->a_vp, ap->a_td, ap->a_events)); @@ -675,11 +629,7 @@ vop_stdpoll(ap) * Return our mount point, as we will take charge of the writes. */ int -vop_stdgetwritemount(ap) - struct vop_getwritemount_args /* { - struct vnode *a_vp; - struct mount **a_mpp; - } */ *ap; +vop_stdgetwritemount(struct vop_getwritemount_args *ap) { struct mount *mp; struct vnode *vp; @@ -707,15 +657,7 @@ vop_stdgetwritemount(ap) * - Report no contiguous runs of blocks. */ int -vop_stdbmap(ap) - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr_t a_bn; - struct bufobj **a_bop; - daddr_t *a_bnp; - int *a_runp; - int *a_runb; - } */ *ap; +vop_stdbmap(struct vop_bmap_args *ap) { if (ap->a_bop != NULL) @@ -730,12 +672,7 @@ vop_stdbmap(ap) } int -vop_stdfsync(ap) - struct vop_fsync_args /* { - struct vnode *a_vp; - int a_waitfor; - struct thread *a_td; - } */ *ap; +vop_stdfsync(struct vop_fsync_args *ap) { return (vn_fsync_buf(ap->a_vp, ap->a_waitfor)); @@ -757,14 +694,7 @@ vop_stdfdatasync_buf(struct vop_fdatasync_args *ap) /* XXX Needs good comment and more info in the manpage (VOP_GETPAGES(9)). */ int -vop_stdgetpages(ap) - struct vop_getpages_args /* { - struct vnode *a_vp; - vm_page_t *a_m; - int a_count; - int *a_rbehind; - int *a_rahead; - } */ *ap; +vop_stdgetpages(struct vop_getpages_args *ap) { return vnode_pager_generic_getpages(ap->a_vp, ap->a_m, @@ -791,14 +721,7 @@ vop_stdkqfilter(struct vop_kqfilter_args *ap) /* XXX Needs good comment and more info in the manpage (VOP_PUTPAGES(9)). */ int -vop_stdputpages(ap) - struct vop_putpages_args /* { - struct vnode *a_vp; - vm_page_t *a_m; - int a_count; - int a_sync; - int *a_rtvals; - } */ *ap; +vop_stdputpages(struct vop_putpages_args *ap) { return vnode_pager_generic_putpages(ap->a_vp, ap->a_m, ap->a_count, @@ -1478,39 +1401,27 @@ vop_stdioctl(struct vop_ioctl_args *ap) * used to fill the vfs function table to get reasonable default return values. */ int -vfs_stdroot (mp, flags, vpp) - struct mount *mp; - int flags; - struct vnode **vpp; +vfs_stdroot(struct mount *mp, int flags, struct vnode **vpp) { return (EOPNOTSUPP); } int -vfs_stdstatfs (mp, sbp) - struct mount *mp; - struct statfs *sbp; +vfs_stdstatfs(struct mount *mp, struct statfs *sbp) { return (EOPNOTSUPP); } int -vfs_stdquotactl (mp, cmds, uid, arg, mp_busy) - struct mount *mp; - int cmds; - uid_t uid; - void *arg; - bool *mp_busy; +vfs_stdquotactl(struct mount *mp, int cmds, uid_t uid, void *arg, bool *mp_busy) { return (EOPNOTSUPP); } int -vfs_stdsync(mp, waitfor) - struct mount *mp; - int waitfor; +vfs_stdsync(struct mount *mp, int waitfor) { struct vnode *vp, *mvp; struct thread *td; @@ -1545,9 +1456,7 @@ loop: } int -vfs_stdnosync (mp, waitfor) - struct mount *mp; - int waitfor; +vfs_stdnosync(struct mount *mp, int waitfor) { return (0); @@ -1565,50 +1474,36 @@ vop_stdcopy_file_range(struct vop_copy_file_range_args *ap) } int -vfs_stdvget (mp, ino, flags, vpp) - struct mount *mp; - ino_t ino; - int flags; - struct vnode **vpp; +vfs_stdvget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) { return (EOPNOTSUPP); } int -vfs_stdfhtovp (mp, fhp, flags, vpp) - struct mount *mp; - struct fid *fhp; - int flags; - struct vnode **vpp; +vfs_stdfhtovp(struct mount *mp, struct fid *fhp, int flags, struct vnode **vpp) { return (EOPNOTSUPP); } int -vfs_stdinit (vfsp) - struct vfsconf *vfsp; +vfs_stdinit(struct vfsconf *vfsp) { return (0); } int -vfs_stduninit (vfsp) - struct vfsconf *vfsp; +vfs_stduninit(struct vfsconf *vfsp) { return(0); } int -vfs_stdextattrctl(mp, cmd, filename_vp, attrnamespace, attrname) - struct mount *mp; - int cmd; - struct vnode *filename_vp; - int attrnamespace; - const char *attrname; +vfs_stdextattrctl(struct mount *mp, int cmd, struct vnode *filename_vp, + int attrnamespace, const char *attrname) { if (filename_vp != NULL) @@ -1617,10 +1512,7 @@ vfs_stdextattrctl(mp, cmd, filename_vp, attrnamespace, attrname) } int -vfs_stdsysctl(mp, op, req) - struct mount *mp; - fsctlop_t op; - struct sysctl_req *req; +vfs_stdsysctl(struct mount *mp, fsctlop_t op, struct sysctl_req *req) { return (EOPNOTSUPP);
