From: Miklos Szeredi Introduce path_mkdir(). Make vfs_mkdir() static. Signed-off-by: Miklos Szeredi --- fs/ecryptfs/inode.c | 15 ++++++++------- fs/namei.c | 23 +++++++++++++++-------- fs/nfsd/nfs4recover.c | 6 +----- fs/nfsd/vfs.c | 2 +- include/linux/fs.h | 2 +- 5 files changed, 26 insertions(+), 22 deletions(-) Index: linux-2.6/fs/ecryptfs/inode.c =================================================================== --- linux-2.6.orig/fs/ecryptfs/inode.c 2008-07-23 00:10:22.000000000 +0200 +++ linux-2.6/fs/ecryptfs/inode.c 2008-07-23 00:10:22.000000000 +0200 @@ -476,21 +476,22 @@ static int ecryptfs_mkdir(struct inode * { int rc; struct dentry *lower_dentry; - struct dentry *lower_dir_dentry; + struct path lower_dir; lower_dentry = ecryptfs_dentry_to_lower(dentry); - lower_dir_dentry = lock_parent(lower_dentry); - rc = vfs_mkdir(lower_dir_dentry->d_inode, lower_dentry, mode); + lower_dir.mnt = ecryptfs_dentry_to_lower_mnt(dentry); + lower_dir.dentry = lock_parent(lower_dentry); + rc = path_mkdir(&lower_dir, lower_dentry, mode); if (rc || !lower_dentry->d_inode) goto out; rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0); if (rc) goto out; - fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); - fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode); - dir->i_nlink = lower_dir_dentry->d_inode->i_nlink; + fsstack_copy_attr_times(dir, lower_dir.dentry->d_inode); + fsstack_copy_inode_size(dir, lower_dir.dentry->d_inode); + dir->i_nlink = lower_dir.dentry->d_inode->i_nlink; out: - unlock_dir(lower_dir_dentry); + unlock_dir(lower_dir.dentry); if (!dentry->d_inode) d_drop(dentry); return rc; Index: linux-2.6/fs/namei.c =================================================================== --- linux-2.6.orig/fs/namei.c 2008-07-23 00:10:22.000000000 +0200 +++ linux-2.6/fs/namei.c 2008-07-23 00:10:22.000000000 +0200 @@ -2052,7 +2052,7 @@ asmlinkage long sys_mknod(const char __u return sys_mknodat(AT_FDCWD, filename, mode, dev); } -int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) +static int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) { int error = may_create(dir, dentry, NULL); @@ -2074,6 +2074,19 @@ int vfs_mkdir(struct inode *dir, struct return error; } +int path_mkdir(struct path *dir_path, struct dentry *dentry, int mode) +{ + int error = mnt_want_write(dir_path->mnt); + + if (!error) { + error = vfs_mkdir(dir_path->dentry->d_inode, dentry, mode); + mnt_drop_write(dir_path->mnt); + } + + return error; +} +EXPORT_SYMBOL(path_mkdir); + asmlinkage long sys_mkdirat(int dfd, const char __user *pathname, int mode) { int error = 0; @@ -2096,12 +2109,7 @@ asmlinkage long sys_mkdirat(int dfd, con if (!IS_POSIXACL(nd.path.dentry->d_inode)) mode &= ~current->fs->umask; - error = mnt_want_write(nd.path.mnt); - if (error) - goto out_dput; - error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode); - mnt_drop_write(nd.path.mnt); -out_dput: + error = path_mkdir(&nd.path, dentry, mode); dput(dentry); out_unlock: mutex_unlock(&nd.path.dentry->d_inode->i_mutex); @@ -2906,7 +2914,6 @@ EXPORT_SYMBOL(file_permission); EXPORT_SYMBOL(unlock_rename); EXPORT_SYMBOL(vfs_follow_link); EXPORT_SYMBOL(vfs_link); -EXPORT_SYMBOL(vfs_mkdir); EXPORT_SYMBOL(generic_permission); EXPORT_SYMBOL(vfs_readlink); EXPORT_SYMBOL(vfs_rename); Index: linux-2.6/fs/nfsd/nfs4recover.c =================================================================== --- linux-2.6.orig/fs/nfsd/nfs4recover.c 2008-07-23 00:10:13.000000000 +0200 +++ linux-2.6/fs/nfsd/nfs4recover.c 2008-07-23 00:10:22.000000000 +0200 @@ -155,11 +155,7 @@ nfsd4_create_clid_dir(struct nfs4_client dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n"); goto out_put; } - status = mnt_want_write(rec_dir.path.mnt); - if (status) - goto out_put; - status = vfs_mkdir(rec_dir.path.dentry->d_inode, dentry, S_IRWXU); - mnt_drop_write(rec_dir.path.mnt); + status = path_mkdir(&rec_dir.path, dentry, S_IRWXU); out_put: dput(dentry); out_unlock: Index: linux-2.6/fs/nfsd/vfs.c =================================================================== --- linux-2.6.orig/fs/nfsd/vfs.c 2008-07-23 00:10:22.000000000 +0200 +++ linux-2.6/fs/nfsd/vfs.c 2008-07-23 00:10:22.000000000 +0200 @@ -1275,7 +1275,7 @@ nfsd_create(struct svc_rqst *rqstp, stru host_err = path_create(&dir_path, dchild, iap->ia_mode, NULL); break; case S_IFDIR: - host_err = vfs_mkdir(dirp, dchild, iap->ia_mode); + host_err = path_mkdir(&dir_path, dchild, iap->ia_mode); break; case S_IFCHR: case S_IFBLK: Index: linux-2.6/include/linux/fs.h =================================================================== --- linux-2.6.orig/include/linux/fs.h 2008-07-23 00:10:22.000000000 +0200 +++ linux-2.6/include/linux/fs.h 2008-07-23 00:10:22.000000000 +0200 @@ -1127,7 +1127,7 @@ extern void unlock_super(struct super_bl */ extern int vfs_permission(struct nameidata *, int); extern int path_create(struct path *, struct dentry *, int, struct nameidata *); -extern int vfs_mkdir(struct inode *, struct dentry *, int); +extern int path_mkdir(struct path *, struct dentry *, int); extern int path_mknod(struct path *, struct dentry *, int, dev_t); extern int vfs_symlink(struct inode *, struct dentry *, const char *); extern int vfs_link(struct dentry *, struct inode *, struct dentry *); -- -- 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/