From: Miklos Szeredi <miklos@szeredi.hu>
To: akpm@linux-foundation.org
Cc: hch@infradead.org, viro@ZenIV.linux.org.uk,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [patch 16/24] vfs: add path_mkdir()
Date: Tue, 06 May 2008 11:13:43 +0200 [thread overview]
Message-ID: <20080506091431.089239587@szeredi.hu> (raw)
In-Reply-To: 20080506091327.259950960@szeredi.hu
[-- Attachment #1: path_mkdir.patch --]
[-- Type: text/plain, Size: 5466 bytes --]
From: Miklos Szeredi <mszeredi@suse.cz>
Introduce path_mkdir(). Make vfs_mkdir() static.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---
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-05-06 11:04:38.000000000 +0200
+++ linux-2.6/fs/ecryptfs/inode.c 2008-05-06 11:04:38.000000000 +0200
@@ -478,21 +478,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-05-06 11:04:38.000000000 +0200
+++ linux-2.6/fs/namei.c 2008-05-06 11:04:38.000000000 +0200
@@ -2129,7 +2129,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);
@@ -2151,6 +2151,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;
@@ -2173,12 +2186,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);
@@ -2982,7 +2990,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-05-06 11:04:28.000000000 +0200
+++ linux-2.6/fs/nfsd/nfs4recover.c 2008-05-06 11:04:38.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-05-06 11:04:38.000000000 +0200
+++ linux-2.6/fs/nfsd/vfs.c 2008-05-06 11:04:38.000000000 +0200
@@ -1273,7 +1273,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-05-06 11:04:38.000000000 +0200
+++ linux-2.6/include/linux/fs.h 2008-05-06 11:04:38.000000000 +0200
@@ -1125,7 +1125,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 *, int);
extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
--
next prev parent reply other threads:[~2008-05-06 9:20 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-06 9:13 [patch 00/24] vfs: fixes and cleanups + add helpers to check r/o bind mounts Miklos Szeredi
2008-05-06 9:13 ` [patch 01/24] nfsd: clean up mnt_want_write calls Miklos Szeredi
2008-05-06 9:13 ` [patch 02/24] cgroup: dont call vfs_mkdir Miklos Szeredi
2008-05-06 9:13 ` [patch 03/24] reiserfs: dont call vfs_rmdir Miklos Szeredi
2008-05-06 9:13 ` [patch 04/24] reiserfs: dont call notify_change Miklos Szeredi
2008-05-08 16:49 ` Christoph Hellwig
2008-05-06 9:13 ` [patch 05/24] sysfs: " Miklos Szeredi
2008-05-08 16:50 ` Christoph Hellwig
2008-05-06 9:13 ` [patch 06/24] hpfs: " Miklos Szeredi
2008-05-08 0:41 ` Mikulas Patocka
2008-05-08 16:52 ` Christoph Hellwig
2008-05-09 1:59 ` Mikulas Patocka
2008-05-06 9:13 ` [patch 07/24] fat: " Miklos Szeredi
2008-05-08 16:57 ` Christoph Hellwig
2008-05-08 18:51 ` Miklos Szeredi
2008-05-08 19:42 ` OGAWA Hirofumi
2008-05-08 23:45 ` James Morris
2008-05-06 9:13 ` [patch 08/24] vfs: immutable inode checking cleanup Miklos Szeredi
2008-05-15 7:23 ` Al Viro
2008-05-15 7:39 ` Miklos Szeredi
2008-05-06 9:13 ` [patch 09/24] vfs: truncate: dont check immutable twice Miklos Szeredi
2008-05-06 9:13 ` [patch 10/24] vfs: truncate: append-only checking cleanup Miklos Szeredi
2008-05-15 7:49 ` Al Viro
2008-05-15 7:58 ` Miklos Szeredi
2008-05-06 9:13 ` [patch 11/24] vfs: create file_truncate() helper Miklos Szeredi
2008-05-06 9:13 ` [patch 12/24] vfs: utimes immutable fix Miklos Szeredi
2008-05-06 9:13 ` [patch 13/24] vfs: utimes cleanup Miklos Szeredi
2008-05-06 10:03 ` Miklos Szeredi
2008-05-15 7:39 ` Al Viro
2008-05-15 7:45 ` Miklos Szeredi
2008-05-06 9:13 ` [patch 14/24] vfs: splice remove_suid() cleanup Miklos Szeredi
2008-05-06 9:13 ` [patch 15/24] vfs: add path_create() and path_mknod() Miklos Szeredi
2008-05-06 9:13 ` Miklos Szeredi [this message]
2008-05-06 9:13 ` [patch 17/24] vfs: add path_rmdir() Miklos Szeredi
2008-05-06 9:13 ` [patch 18/24] vfs: add path_unlink() Miklos Szeredi
2008-05-06 9:13 ` [patch 19/24] vfs: add path_symlink() Miklos Szeredi
2008-05-06 9:13 ` [patch 20/24] vfs: add path_link() Miklos Szeredi
2008-05-06 9:13 ` [patch 21/24] vfs: add path_rename() Miklos Szeredi
2008-05-06 9:13 ` [patch 22/24] vfs: add path_setattr() Miklos Szeredi
2008-05-06 9:13 ` [patch 23/24] vfs: add path_setxattr() Miklos Szeredi
2008-05-06 9:13 ` [patch 24/24] vfs: add path_removexattr() Miklos Szeredi
2008-05-06 9:16 ` [patch 00/24] vfs: fixes and cleanups + add helpers to check r/o bind mounts Christoph Hellwig
2008-05-06 10:33 ` Miklos Szeredi
2008-05-14 14:55 ` Pavel Machek
2008-05-07 11:57 ` Miklos Szeredi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080506091431.089239587@szeredi.hu \
--to=miklos@szeredi.hu \
--cc=akpm@linux-foundation.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).