From 6c0ad4a77a7420194e8745355fa5855c4da18ee3 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Mon, 26 Apr 2004 15:44:42 +0000 Subject: [PATCH] Always use nd.ni_vp->v_mount as an argument for VFS_QUOTACTL(), just like in RELENG_4. Pointed out by: Alex Lyashkov --- sys/kern/vfs_extattr.c | 9 ++++----- sys/kern/vfs_syscalls.c | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index 593ec759a92..992325a4e72 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -183,7 +183,7 @@ quotactl(td, uap) caddr_t arg; } */ *uap; { - struct mount *mp; + struct mount *mp, *vmp; int error; struct nameidata nd; @@ -193,14 +193,13 @@ quotactl(td, uap) if ((error = namei(&nd)) != 0) return (error); NDFREE(&nd, NDF_ONLY_PNBUF); - error = vn_start_write(nd.ni_vp, &mp, V_WAIT | PCATCH); + error = vn_start_write(nd.ni_vp, &vmp, V_WAIT | PCATCH); + mp = nd.ni_vp->v_mount; vrele(nd.ni_vp); if (error) return (error); - if (mp == NULL) - return (EOPNOTSUPP); error = VFS_QUOTACTL(mp, uap->cmd, uap->uid, uap->arg, td); - vn_finished_write(mp); + vn_finished_write(vmp); return (error); } diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 593ec759a92..992325a4e72 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -183,7 +183,7 @@ quotactl(td, uap) caddr_t arg; } */ *uap; { - struct mount *mp; + struct mount *mp, *vmp; int error; struct nameidata nd; @@ -193,14 +193,13 @@ quotactl(td, uap) if ((error = namei(&nd)) != 0) return (error); NDFREE(&nd, NDF_ONLY_PNBUF); - error = vn_start_write(nd.ni_vp, &mp, V_WAIT | PCATCH); + error = vn_start_write(nd.ni_vp, &vmp, V_WAIT | PCATCH); + mp = nd.ni_vp->v_mount; vrele(nd.ni_vp); if (error) return (error); - if (mp == NULL) - return (EOPNOTSUPP); error = VFS_QUOTACTL(mp, uap->cmd, uap->uid, uap->arg, td); - vn_finished_write(mp); + vn_finished_write(vmp); return (error); }