[PATCH v4 07/17] vfs: add new "reval" argument to kern_path_create
From: Jeff Layton <hidden>
Date: 2012-07-26 11:55:10
Also in:
linux-fsdevel, lkml
Subsystem:
driver core, kobjects, debugfs and sysfs, filesystems (vfs and infrastructure), networking [general], networking [unix sockets], the rest · Maintainers:
Greg Kroah-Hartman, "Rafael J. Wysocki", Danilo Krummrich, Alexander Viro, Christian Brauner, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Kuniyuki Iwashima, Linus Torvalds
...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 <redacted> --- drivers/base/devtmpfs.c | 7 ++++--- fs/namei.c | 12 +++++++++--- include/linux/namei.h | 2 +- net/unix/af_unix.c | 3 ++- 4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index d91a3a0..f41e49b 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);
@@ -195,10 +195,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 6563077..438ed67 100644
--- a/fs/namei.c
+++ b/fs/namei.c@@ -2844,11 +2844,17 @@ 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 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);
@@ -2901,7 +2907,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 dc2a306..d56faaa 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 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 641f2e4..d94caa9 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c@@ -866,7 +866,8 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) * 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)) goto out_mknod_parent;
--
1.7.11.2