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 v8 04/32] vfs: add new "reval" argument to kern_path_create and user_path_create
Date: Sat, 27 Oct 2012 08:33:11 -0400 [thread overview]
Message-ID: <1351341219-17837-5-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1351341219-17837-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>
---
arch/powerpc/platforms/cell/spufs/syscalls.c | 2 +-
drivers/base/devtmpfs.c | 7 ++++---
fs/namei.c | 23 +++++++++++++++--------
fs/ocfs2/refcounttree.c | 3 ++-
include/linux/namei.h | 4 ++--
net/unix/af_unix.c | 2 +-
6 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c
index 5b7d8ff..cb4acc7 100644
--- a/arch/powerpc/platforms/cell/spufs/syscalls.c
+++ b/arch/powerpc/platforms/cell/spufs/syscalls.c
@@ -66,7 +66,7 @@ static long do_spu_create(const char __user *pathname, unsigned int flags,
struct dentry *dentry;
int ret;
- dentry = user_path_create(AT_FDCWD, pathname, &path, 1);
+ dentry = user_path_create(AT_FDCWD, pathname, &path, true, false);
ret = PTR_ERR(dentry);
if (!IS_ERR(dentry)) {
ret = spufs_create(&path, dentry, flags, mode, neighbor);
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index 147d1a4..128e156 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 d1895f3..a2bb283 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3039,12 +3039,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);
@@ -3108,13 +3114,14 @@ void done_path_create(struct path *path, struct dentry *dentry)
}
EXPORT_SYMBOL(done_path_create);
-struct dentry *user_path_create(int dfd, const char __user *pathname, struct path *path, int is_dir)
+struct dentry *user_path_create(int dfd, const char __user *pathname,
+ struct path *path, bool is_dir, bool reval)
{
struct filename *tmp = getname(pathname);
struct dentry *res;
if (IS_ERR(tmp))
return ERR_CAST(tmp);
- res = kern_path_create(dfd, tmp->name, path, is_dir);
+ res = kern_path_create(dfd, tmp->name, path, is_dir, reval);
putname(tmp);
return res;
}
@@ -3175,7 +3182,7 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
if (error)
return error;
- dentry = user_path_create(dfd, filename, &path, 0);
+ dentry = user_path_create(dfd, filename, &path, false, false);
if (IS_ERR(dentry))
return PTR_ERR(dentry);
@@ -3237,7 +3244,7 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode)
struct path path;
int error;
- dentry = user_path_create(dfd, pathname, &path, 1);
+ dentry = user_path_create(dfd, pathname, &path, true, false);
if (IS_ERR(dentry))
return PTR_ERR(dentry);
@@ -3513,7 +3520,7 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
if (IS_ERR(from))
return PTR_ERR(from);
- dentry = user_path_create(newdfd, newname, &path, 0);
+ dentry = user_path_create(newdfd, newname, &path, false, false);
error = PTR_ERR(dentry);
if (IS_ERR(dentry))
goto out_putname;
@@ -3613,7 +3620,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
if (error)
return error;
- new_dentry = user_path_create(newdfd, newname, &new_path, 0);
+ new_dentry = user_path_create(newdfd, newname, &new_path, false, false);
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry))
goto out;
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index 30a0550..645e225 100644
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -4453,7 +4453,8 @@ int ocfs2_reflink_ioctl(struct inode *inode,
return error;
}
- new_dentry = user_path_create(AT_FDCWD, newname, &new_path, 0);
+ new_dentry = user_path_create(AT_FDCWD, newname, &new_path,
+ false, false);
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry)) {
mlog_errno(error);
diff --git a/include/linux/namei.h b/include/linux/namei.h
index 4bf19d8..2202740 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -65,8 +65,8 @@ extern int user_path_at_empty(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 *user_path_create(int, const char __user *, 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 *, bool, bool);
extern void done_path_create(struct path *, struct dentry *);
extern struct dentry *kern_path_locked(const char *, struct path *);
extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 5b5c876..8ce6209 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -829,7 +829,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.7
next prev parent reply other threads:[~2012-10-27 12:33 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-27 12:33 [PATCH v8 00/32] vfs: add the ability to retry lookup and operation to most path-based syscalls Jeff Layton
2012-10-27 12:33 ` [PATCH v8 01/32] vfs: add a retry_estale helper function to handle retries on ESTALE Jeff Layton
2012-10-27 12:33 ` [PATCH v8 02/32] vfs: make fstatat retry on ESTALE errors from getattr call Jeff Layton
2012-10-27 12:33 ` [PATCH v8 03/32] vfs: fix readlinkat to retry on ESTALE Jeff Layton
2012-10-27 12:33 ` Jeff Layton [this message]
2012-10-27 12:33 ` [PATCH v8 05/32] vfs: fix mknodat to retry on ESTALE errors Jeff Layton
2012-10-27 12:33 ` [PATCH v8 07/32] vfs: fix symlinkat " Jeff Layton
2012-10-27 12:33 ` [PATCH v8 08/32] vfs: fix linkat " Jeff Layton
2012-10-27 12:33 ` [PATCH v8 09/32] vfs: add a reval argument to user_path_parent Jeff Layton
[not found] ` <1351341219-17837-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2012-10-27 12:33 ` [PATCH v8 06/32] vfs: fix mkdir to retry on ESTALE errors Jeff Layton
2012-10-27 12:33 ` [PATCH v8 10/32] vfs: make rmdir " Jeff Layton
2012-10-27 12:33 ` [PATCH v8 16/32] vfs: make chroot retry once on ESTALE error Jeff Layton
2012-10-27 12:33 ` [PATCH v8 21/32] vfs: allow setxattr to retry once on ESTALE errors Jeff Layton
2012-10-27 12:33 ` [PATCH v8 22/32] vfs: allow lsetxattr() " Jeff Layton
2012-10-27 12:33 ` [PATCH v8 32/32] vfs: make number of ESTALE retries tunable Jeff Layton
2012-10-27 12:33 ` [PATCH v8 11/32] vfs: make do_unlinkat retry on ESTALE errors Jeff Layton
[not found] ` <1351341219-17837-12-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2012-10-30 16:14 ` J. Bruce Fields
[not found] ` <20121030161429.GD24618-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2012-10-30 16:33 ` Jeff Layton
[not found] ` <20121030123355.5c404373-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2012-10-30 19:28 ` J. Bruce Fields
[not found] ` <20121030192809.GE24618-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2012-10-30 19:45 ` Jeff Layton
2012-10-27 12:33 ` [PATCH v8 12/32] vfs: fix renameat to " Jeff Layton
2012-10-27 12:33 ` [PATCH v8 13/32] vfs: have do_sys_truncate retry once on an ESTALE error Jeff Layton
2012-10-27 12:33 ` [PATCH v8 14/32] vfs: have faccessat " Jeff Layton
2012-10-27 12:33 ` [PATCH v8 15/32] vfs: have chdir retry lookup and call once on " Jeff Layton
2012-10-27 12:33 ` [PATCH v8 17/32] vfs: make fchmodat retry once on ESTALE errors Jeff Layton
2012-10-27 12:33 ` [PATCH v8 18/32] vfs: make fchownat " Jeff Layton
2012-10-27 12:33 ` [PATCH v8 19/32] vfs: fix user_statfs to " Jeff Layton
2012-10-27 12:33 ` [PATCH v8 20/32] vfs: allow utimensat() calls to retry once on an ESTALE error Jeff Layton
2012-10-27 12:33 ` [PATCH v8 23/32] vfs: make getxattr " Jeff Layton
2012-10-27 12:33 ` [PATCH v8 24/32] vfs: make lgetxattr retry once on ESTALE Jeff Layton
2012-10-27 12:33 ` [PATCH v8 25/32] vfs: make listxattr retry once on ESTALE error Jeff Layton
2012-10-27 12:33 ` [PATCH v8 26/32] vfs: make llistxattr " Jeff Layton
2012-10-27 12:33 ` [PATCH v8 27/32] vfs: make removexattr retry once on ESTALE Jeff Layton
2012-10-27 12:33 ` [PATCH v8 28/32] vfs: make lremovexattr retry once on ESTALE error Jeff Layton
2012-10-27 12:33 ` [PATCH v8 29/32] vfs: convert do_filp_open to use retry_estale helper Jeff Layton
2012-10-27 12:33 ` [PATCH v8 30/32] vfs: convert do_file_open_root " Jeff Layton
2012-10-27 12:33 ` [PATCH v8 31/32] vfs: convert filename_lookup " 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=1351341219-17837-5-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: 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).