From: Jeff Layton <jlayton@redhat.com> To: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, michael.brantley@deshaw.com, hch@infradead.org, miklos@szeredi.hu, pstaubach@exagrid.com Subject: [PATCH v5 07/19] vfs: add new "reval" argument to kern_path_create Date: Wed, 8 Aug 2012 09:21:30 -0400 [thread overview] Message-ID: <1344432102-22312-8-git-send-email-jlayton@redhat.com> (raw) In-Reply-To: <1344432102-22312-1-git-send-email-jlayton@redhat.com> ...for now, all of the callers pass in "false". Eventually, we'll set that to "true" when we retry the lookup after getting back an ESTALE on a call. While we're at it, change the is_dir arg to a bool since that's how it's used currently. Signed-off-by: Jeff Layton <jlayton@redhat.com> --- drivers/base/devtmpfs.c | 7 ++++--- fs/namei.c | 12 +++++++++--- include/linux/namei.h | 2 +- net/unix/af_unix.c | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index deb4a45..2124437 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c @@ -148,7 +148,7 @@ static int dev_mkdir(const char *name, umode_t mode) struct path path; int err; - dentry = kern_path_create(AT_FDCWD, name, &path, 1); + dentry = kern_path_create(AT_FDCWD, name, &path, true, false); if (IS_ERR(dentry)) return PTR_ERR(dentry); @@ -193,10 +193,11 @@ static int handle_create(const char *nodename, umode_t mode, struct device *dev) struct path path; int err; - dentry = kern_path_create(AT_FDCWD, nodename, &path, 0); + dentry = kern_path_create(AT_FDCWD, nodename, &path, false, false); if (dentry == ERR_PTR(-ENOENT)) { create_path(nodename); - dentry = kern_path_create(AT_FDCWD, nodename, &path, 0); + dentry = kern_path_create(AT_FDCWD, nodename, &path, + false, false); } if (IS_ERR(dentry)) return PTR_ERR(dentry); diff --git a/fs/namei.c b/fs/namei.c index f0463bc..f04ba14 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2972,12 +2972,18 @@ struct file *do_file_open_root(struct dentry *dentry, struct vfsmount *mnt, return file; } -struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path, int is_dir) +struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path, bool is_dir, bool reval) { struct dentry *dentry = ERR_PTR(-EEXIST); struct nameidata nd; int err2; - int error = do_path_lookup(dfd, pathname, LOOKUP_PARENT, &nd); + int error; + unsigned int lookup_flags = LOOKUP_PARENT; + + if (reval) + lookup_flags |= LOOKUP_REVAL; + + error = do_path_lookup(dfd, pathname, lookup_flags, &nd); if (error) return ERR_PTR(error); @@ -3047,7 +3053,7 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat struct dentry *res; if (IS_ERR(tmp)) return ERR_CAST(tmp); - res = kern_path_create(dfd, tmp, path, is_dir); + res = kern_path_create(dfd, tmp, path, (bool)is_dir, false); putname(tmp); return res; } diff --git a/include/linux/namei.h b/include/linux/namei.h index 491fb48..24c4962 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -65,7 +65,7 @@ extern int user_path_at(int, const char __user *, unsigned, struct path *); extern int kern_path(const char *, unsigned, struct path *); -extern struct dentry *kern_path_create(int, const char *, struct path *, int); +extern struct dentry *kern_path_create(int, const char *, struct path *, bool, bool); extern struct dentry *user_path_create(int, const char __user *, struct path *, int); extern void done_path_create(struct path *, struct dentry *); extern struct dentry *kern_path_locked(const char *, struct path *); diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index e4768c1..3f61f4c 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -832,7 +832,7 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res) * Get the parent directory, calculate the hash for last * component. */ - dentry = kern_path_create(AT_FDCWD, sun_path, &path, 0); + dentry = kern_path_create(AT_FDCWD, sun_path, &path, false, false); err = PTR_ERR(dentry); if (IS_ERR(dentry)) return err; -- 1.7.11.2
WARNING: multiple messages have this Message-ID (diff)
From: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> To: viro-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org Cc: linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, michael.brantley-Iq/kdjr4a97QT0dZR+AlfA@public.gmane.org, hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org, miklos-sUDqSbJrdHQHWmgEVkV9KA@public.gmane.org, pstaubach-83r9SdEf25FBDgjK7y7TUQ@public.gmane.org Subject: [PATCH v5 07/19] vfs: add new "reval" argument to kern_path_create Date: Wed, 8 Aug 2012 09:21:30 -0400 [thread overview] Message-ID: <1344432102-22312-8-git-send-email-jlayton@redhat.com> (raw) In-Reply-To: <1344432102-22312-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> ...for now, all of the callers pass in "false". Eventually, we'll set that to "true" when we retry the lookup after getting back an ESTALE on a call. While we're at it, change the is_dir arg to a bool since that's how it's used currently. Signed-off-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> --- drivers/base/devtmpfs.c | 7 ++++--- fs/namei.c | 12 +++++++++--- include/linux/namei.h | 2 +- net/unix/af_unix.c | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index deb4a45..2124437 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c @@ -148,7 +148,7 @@ static int dev_mkdir(const char *name, umode_t mode) struct path path; int err; - dentry = kern_path_create(AT_FDCWD, name, &path, 1); + dentry = kern_path_create(AT_FDCWD, name, &path, true, false); if (IS_ERR(dentry)) return PTR_ERR(dentry); @@ -193,10 +193,11 @@ static int handle_create(const char *nodename, umode_t mode, struct device *dev) struct path path; int err; - dentry = kern_path_create(AT_FDCWD, nodename, &path, 0); + dentry = kern_path_create(AT_FDCWD, nodename, &path, false, false); if (dentry == ERR_PTR(-ENOENT)) { create_path(nodename); - dentry = kern_path_create(AT_FDCWD, nodename, &path, 0); + dentry = kern_path_create(AT_FDCWD, nodename, &path, + false, false); } if (IS_ERR(dentry)) return PTR_ERR(dentry); diff --git a/fs/namei.c b/fs/namei.c index f0463bc..f04ba14 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2972,12 +2972,18 @@ struct file *do_file_open_root(struct dentry *dentry, struct vfsmount *mnt, return file; } -struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path, int is_dir) +struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path, bool is_dir, bool reval) { struct dentry *dentry = ERR_PTR(-EEXIST); struct nameidata nd; int err2; - int error = do_path_lookup(dfd, pathname, LOOKUP_PARENT, &nd); + int error; + unsigned int lookup_flags = LOOKUP_PARENT; + + if (reval) + lookup_flags |= LOOKUP_REVAL; + + error = do_path_lookup(dfd, pathname, lookup_flags, &nd); if (error) return ERR_PTR(error); @@ -3047,7 +3053,7 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat struct dentry *res; if (IS_ERR(tmp)) return ERR_CAST(tmp); - res = kern_path_create(dfd, tmp, path, is_dir); + res = kern_path_create(dfd, tmp, path, (bool)is_dir, false); putname(tmp); return res; } diff --git a/include/linux/namei.h b/include/linux/namei.h index 491fb48..24c4962 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -65,7 +65,7 @@ extern int user_path_at(int, const char __user *, unsigned, struct path *); extern int kern_path(const char *, unsigned, struct path *); -extern struct dentry *kern_path_create(int, const char *, struct path *, int); +extern struct dentry *kern_path_create(int, const char *, struct path *, bool, bool); extern struct dentry *user_path_create(int, const char __user *, struct path *, int); extern void done_path_create(struct path *, struct dentry *); extern struct dentry *kern_path_locked(const char *, struct path *); diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index e4768c1..3f61f4c 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -832,7 +832,7 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res) * Get the parent directory, calculate the hash for last * component. */ - dentry = kern_path_create(AT_FDCWD, sun_path, &path, 0); + dentry = kern_path_create(AT_FDCWD, sun_path, &path, false, false); err = PTR_ERR(dentry); if (IS_ERR(dentry)) return err; -- 1.7.11.2 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2012-08-08 13:26 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-08 13:21 [PATCH v5 00/19] vfs: add the ability to retry on ESTALE to several syscalls Jeff Layton 2012-08-08 13:21 ` [PATCH v5 01/19] vfs: add a retry_estale helper function to handle retries on ESTALE Jeff Layton 2012-08-08 13:21 ` [PATCH v5 02/19] vfs: add a kern_path_at function Jeff Layton 2012-08-08 13:21 ` [PATCH v5 03/19] vfs: make fstatat retry on ESTALE errors from getattr call Jeff Layton 2012-08-08 13:21 ` [PATCH v5 04/19] vfs: fix readlinkat to retry on ESTALE Jeff Layton 2012-08-08 13:21 ` Jeff Layton 2012-08-08 13:21 ` [PATCH v5 05/19] vfs: remove user_path_at_empty Jeff Layton 2012-08-08 13:21 ` Jeff Layton 2012-08-08 13:21 ` [PATCH v5 06/19] vfs: turn "empty" arg in getname_flags into a bool Jeff Layton 2012-08-08 13:21 ` Jeff Layton [this message] 2012-08-08 13:21 ` [PATCH v5 07/19] vfs: add new "reval" argument to kern_path_create Jeff Layton 2012-08-08 13:21 ` [PATCH v5 08/19] vfs: fix mknodat to retry on ESTALE errors Jeff Layton 2012-08-08 13:21 ` [PATCH v5 09/19] vfs: fix mkdir " Jeff Layton 2012-08-08 13:21 ` [PATCH v5 10/19] vfs: fix symlinkat " Jeff Layton 2012-08-08 13:21 ` [PATCH v5 11/19] vfs: fix linkat " Jeff Layton 2012-08-08 13:21 ` [PATCH v5 12/19] vfs: make rmdir " Jeff Layton 2012-08-08 13:21 ` [PATCH v5 13/19] vfs: make do_unlinkat " Jeff Layton 2012-08-08 13:21 ` [PATCH v5 14/19] vfs: fix renameat to " Jeff Layton 2012-08-08 13:21 ` [PATCH v5 15/19] vfs: remove user_path_parent Jeff Layton 2012-08-08 13:21 ` [PATCH v5 16/19] vfs: have do_sys_truncate retry once on an ESTALE error Jeff Layton 2012-08-08 13:21 ` [PATCH v5 17/19] vfs: have faccessat " Jeff Layton 2012-08-08 13:21 ` [PATCH v5 18/19] vfs: have chdir retry lookup and call once on " Jeff Layton 2012-08-08 13:21 ` [PATCH v5 19/19] vfs: make chroot retry " Jeff Layton 2012-08-09 11:57 ` [PATCH v5 00/19] vfs: add the ability to retry on ESTALE to several syscalls Namjae Jeon 2012-08-09 11:57 ` Namjae Jeon 2012-08-09 12:18 ` Jeff Layton 2012-08-09 12:18 ` Jeff Layton
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=1344432102-22312-8-git-send-email-jlayton@redhat.com \ --to=jlayton@redhat.com \ --cc=hch@infradead.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nfs@vger.kernel.org \ --cc=michael.brantley@deshaw.com \ --cc=miklos@szeredi.hu \ --cc=pstaubach@exagrid.com \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.