Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946479AbXBIWz3 (ORCPT ); Fri, 9 Feb 2007 17:55:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1946516AbXBIWye (ORCPT ); Fri, 9 Feb 2007 17:54:34 -0500 Received: from e6.ny.us.ibm.com ([32.97.182.146]:53984 "EHLO e6.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423365AbXBIWxk (ORCPT ); Fri, 9 Feb 2007 17:53:40 -0500 Subject: [PATCH 11/22] elevate write count over calls to vfs_rename() To: linux-kernel@vger.kernel.org Cc: akpm@osdl.org, hch@infradead.org, Dave Hansen From: Dave Hansen Date: Fri, 09 Feb 2007 14:53:37 -0800 References: <20070209225329.27619A62@localhost.localdomain> In-Reply-To: <20070209225329.27619A62@localhost.localdomain> Message-Id: <20070209225337.F5711AF7@localhost.localdomain> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2362 Lines: 77 This does create a little helper in the NFS code to make an if() a little bit less ugly. Signed-off-by: Dave Hansen --- lxc-dave/fs/namei.c | 4 ++++ lxc-dave/fs/nfsd/vfs.c | 23 +++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff -puN fs/namei.c~13-24-elevate-write-count-over-calls-to-vfs-rename fs/namei.c --- lxc/fs/namei.c~13-24-elevate-write-count-over-calls-to-vfs-rename 2007-02-09 14:26:53.000000000 -0800 +++ lxc-dave/fs/namei.c 2007-02-09 14:26:53.000000000 -0800 @@ -2567,8 +2567,12 @@ static int do_rename(int olddfd, const c if (new_dentry == trap) goto exit5; + error = mnt_want_write(oldnd.mnt); + if (error) + goto exit5; error = vfs_rename(old_dir->d_inode, old_dentry, new_dir->d_inode, new_dentry); + mnt_drop_write(oldnd.mnt); exit5: dput(new_dentry); exit4: diff -puN fs/nfsd/vfs.c~13-24-elevate-write-count-over-calls-to-vfs-rename fs/nfsd/vfs.c --- lxc/fs/nfsd/vfs.c~13-24-elevate-write-count-over-calls-to-vfs-rename 2007-02-09 14:26:53.000000000 -0800 +++ lxc-dave/fs/nfsd/vfs.c 2007-02-09 14:26:53.000000000 -0800 @@ -1555,6 +1555,14 @@ out_nfserr: goto out_unlock; } +static inline int svc_msnfs(struct svc_fh *ffhp) +{ +#ifdef MSNFS + return (ffhp->fh_export->ex_flags & NFSEXP_MSNFS); +#else + return 0; +#endif +} /* * Rename a file * N.B. After this call _both_ ffhp and tfhp need an fh_put @@ -1616,13 +1624,20 @@ nfsd_rename(struct svc_rqst *rqstp, stru if (ndentry == trap) goto out_dput_new; -#ifdef MSNFS - if ((ffhp->fh_export->ex_flags & NFSEXP_MSNFS) && + if (svc_msnfs(ffhp) && ((atomic_read(&odentry->d_count) > 1) || (atomic_read(&ndentry->d_count) > 1))) { host_err = -EPERM; - } else -#endif + goto out_dput_new; + } + + host_err = -EXDEV; + if (ffhp->fh_export->ex_mnt != tfhp->fh_export->ex_mnt) + goto out_dput_new; + host_err = mnt_want_write(ffhp->fh_export->ex_mnt); + if (host_err) + goto out_dput_new; + host_err = vfs_rename(fdir, odentry, tdir, ndentry); if (!host_err && EX_ISSYNC(tfhp->fh_export)) { host_err = nfsd_sync_dir(tdentry); _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/