From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Hansen Subject: [RFC][PATCH 02/20] r/o bind mount prepwork: move open_namei()'s vfs_create() Date: Fri, 16 Jun 2006 16:12:14 -0700 Message-ID: <20060616231214.01AEF966@localhost.localdomain> References: <20060616231213.D4C5D6AF@localhost.localdomain> Cc: linux-fsdevel@vger.kernel.org, herbert@13thfloor.at, viro@ftp.linux.org.uk, Dave Hansen Return-path: Received: from e3.ny.us.ibm.com ([32.97.182.143]:31967 "EHLO e3.ny.us.ibm.com") by vger.kernel.org with ESMTP id S1751549AbWFPXMT (ORCPT ); Fri, 16 Jun 2006 19:12:19 -0400 To: linux-kernel@vger.kernel.org In-Reply-To: <20060616231213.D4C5D6AF@localhost.localdomain> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org The code around vfs_create() in open_namei() is getting a bit too complex. Right now, there is at least the reference count on the dentry, and the i_mutex to worry about. Soon, we'll also have mnt_writecount. So, break the vfs_create() call out of open_namei(), and into a helper function. This duplicates the call to may_open(), but that isn't such a bad thing since the arguments (acc_mode and flag) were being heavily massaged anyway. Later in the series, we'll add the mnt_writecount handling around this new function call. Signed-off-by: Dave Hansen --- lxc-dave/fs/namei.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff -puN fs/namei.c~C-prepwork-cleanup-open_namei fs/namei.c --- lxc/fs/namei.c~C-prepwork-cleanup-open_namei 2006-06-16 15:58:00.000000000 -0700 +++ lxc-dave/fs/namei.c 2006-06-16 15:58:00.000000000 -0700 @@ -1560,6 +1560,24 @@ int may_open(struct nameidata *nd, int a return 0; } +static int open_namei_create(struct nameidata *nd, struct path *path, + int flag, int mode) +{ + int error; + struct dentry *dir = nd->dentry; + + if (!IS_POSIXACL(dir->d_inode)) + mode &= ~current->fs->umask; + error = vfs_create(dir->d_inode, path->dentry, mode, nd); + mutex_unlock(&dir->d_inode->i_mutex); + dput(nd->dentry); + nd->dentry = path->dentry; + if (error) + return error; + /* Don't check for write permission, don't truncate */ + return may_open(nd, 0, flag & ~O_TRUNC); +} + /* * open_namei() * @@ -1641,18 +1659,10 @@ do_last: /* Negative dentry, just create the file */ if (!path.dentry->d_inode) { - if (!IS_POSIXACL(dir->d_inode)) - mode &= ~current->fs->umask; - error = vfs_create(dir->d_inode, path.dentry, mode, nd); - mutex_unlock(&dir->d_inode->i_mutex); - dput(nd->dentry); - nd->dentry = path.dentry; + error = open_namei_create(nd, &path, flag, mode); if (error) goto exit; - /* Don't check for write permission, don't truncate */ - acc_mode = 0; - flag &= ~O_TRUNC; - goto ok; + return 0; } /* _