From: Jan Blunck <jblunck@suse.de>
To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Bharata B Rao <bharata@linux.vnet.ibm.com>
Subject: [RFC 04/26] VFS: Make lookup_create() return a struct path
Date: Mon, 30 Jul 2007 18:13:27 +0200 [thread overview]
Message-ID: <20070730161323.507965230@weierstrass.suse.de> (raw)
In-Reply-To: <20070730161323.100048969@weierstrass.suse.de>
[-- Attachment #1: um/vfs-lookup_create-returns-path.diff --]
[-- Type: text/plain, Size: 9074 bytes --]
This patch changes lookup_create() into returning a struct path.
Signed-off-by: Jan Blunck <jblunck@suse.de>
---
arch/powerpc/platforms/cell/spufs/inode.c | 15 ++----
fs/namei.c | 75 +++++++++++++-----------------
include/linux/dcache.h | 1
include/linux/namei.h | 1
net/unix/af_unix.c | 17 +++---
5 files changed, 50 insertions(+), 59 deletions(-)
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -456,7 +456,7 @@ static struct file_system_type spufs_typ
long spufs_create(struct nameidata *nd, unsigned int flags, mode_t mode)
{
- struct dentry *dentry;
+ struct path path;
int ret;
ret = -EINVAL;
@@ -475,26 +475,25 @@ long spufs_create(struct nameidata *nd,
goto out;
}
- dentry = lookup_create(nd, 1);
- ret = PTR_ERR(dentry);
- if (IS_ERR(dentry))
+ ret = lookup_create(nd, 1, &path);
+ if (ret)
goto out_dir;
ret = -EEXIST;
- if (dentry->d_inode)
+ if (path.dentry->d_inode)
goto out_dput;
mode &= ~current->fs->umask;
if (flags & SPU_CREATE_GANG)
return spufs_create_gang(nd->dentry->d_inode,
- dentry, nd->mnt, mode);
+ path.dentry, path.mnt, mode);
else
return spufs_create_context(nd->dentry->d_inode,
- dentry, nd->mnt, flags, mode);
+ path.dentry, path.mnt, flags, mode);
out_dput:
- dput(dentry);
+ dput_path(&path, nd);
out_dir:
mutex_unlock(&nd->dentry->d_inode->i_mutex);
out:
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1833,10 +1833,9 @@ do_link:
*
* Returns with nd->dentry->d_inode->i_mutex locked.
*/
-struct dentry *lookup_create(struct nameidata *nd, int is_dir)
+int lookup_create(struct nameidata *nd, int is_dir, struct path *path)
{
- struct path path = { .dentry = ERR_PTR(-EEXIST) } ;
- int err;
+ int err = -EEXIST;
mutex_lock_nested(&nd->dentry->d_inode->i_mutex, I_MUTEX_PARENT);
/*
@@ -1852,11 +1851,9 @@ struct dentry *lookup_create(struct name
/*
* Do the final lookup.
*/
- err = lookup_hash(nd, &nd->last, &path);
- if (err) {
- path.dentry = ERR_PTR(err);
+ err = lookup_hash(nd, &nd->last, path);
+ if (err)
goto fail;
- }
/*
* Special case - lookup gave negative, but... we had foo/bar/
@@ -1864,16 +1861,14 @@ struct dentry *lookup_create(struct name
* all is fine. Let's be bastards - you had / on the end, you've
* been asking for (non-existent) directory. -ENOENT for you.
*/
- if (!is_dir && nd->last.name[nd->last.len] && !path.dentry->d_inode)
+ if (!is_dir && nd->last.name[nd->last.len] && !path->dentry->d_inode)
goto enoent;
- if (nd->mnt != path.mnt)
- mntput(path.mnt);
- return path.dentry;
+ return 0;
enoent:
- dput_path(&path, nd);
- path.dentry = ERR_PTR(-ENOENT);
+ dput_path(path, nd);
+ err = -ENOENT;
fail:
- return path.dentry;
+ return err;
}
EXPORT_SYMBOL_GPL(lookup_create);
@@ -1906,7 +1901,7 @@ asmlinkage long sys_mknodat(int dfd, con
{
int error = 0;
char * tmp;
- struct dentry * dentry;
+ struct path path;
struct nameidata nd;
if (S_ISDIR(mode))
@@ -1918,22 +1913,23 @@ asmlinkage long sys_mknodat(int dfd, con
error = do_path_lookup(dfd, tmp, LOOKUP_PARENT, &nd);
if (error)
goto out;
- dentry = lookup_create(&nd, 0);
- error = PTR_ERR(dentry);
+ error = lookup_create(&nd, 0, &path);
if (!IS_POSIXACL(nd.dentry->d_inode))
mode &= ~current->fs->umask;
- if (!IS_ERR(dentry)) {
+ if (!error) {
switch (mode & S_IFMT) {
case 0: case S_IFREG:
- error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd);
+ error = vfs_create(nd.dentry->d_inode, path.dentry,
+ mode, &nd);
break;
case S_IFCHR: case S_IFBLK:
- error = vfs_mknod(nd.dentry->d_inode,dentry,mode,
- new_decode_dev(dev));
+ error = vfs_mknod(nd.dentry->d_inode, path.dentry,
+ mode, new_decode_dev(dev));
break;
case S_IFIFO: case S_IFSOCK:
- error = vfs_mknod(nd.dentry->d_inode,dentry,mode,0);
+ error = vfs_mknod(nd.dentry->d_inode, path.dentry,
+ mode, 0);
break;
case S_IFDIR:
error = -EPERM;
@@ -1941,7 +1937,7 @@ asmlinkage long sys_mknodat(int dfd, con
default:
error = -EINVAL;
}
- dput(dentry);
+ dput_path(&path, &nd);
}
mutex_unlock(&nd.dentry->d_inode->i_mutex);
path_release(&nd);
@@ -1982,7 +1978,7 @@ asmlinkage long sys_mkdirat(int dfd, con
{
int error = 0;
char * tmp;
- struct dentry *dentry;
+ struct path path;
struct nameidata nd;
tmp = getname(pathname);
@@ -1993,15 +1989,14 @@ asmlinkage long sys_mkdirat(int dfd, con
error = do_path_lookup(dfd, tmp, LOOKUP_PARENT, &nd);
if (error)
goto out;
- dentry = lookup_create(&nd, 1);
- error = PTR_ERR(dentry);
- if (IS_ERR(dentry))
+ error = lookup_create(&nd, 1, &path);
+ if (error)
goto out_unlock;
if (!IS_POSIXACL(nd.dentry->d_inode))
mode &= ~current->fs->umask;
- error = vfs_mkdir(nd.dentry->d_inode, dentry, mode);
- dput(dentry);
+ error = vfs_mkdir(nd.dentry->d_inode, path.dentry, mode);
+ dput_path(&path, &nd);
out_unlock:
mutex_unlock(&nd.dentry->d_inode->i_mutex);
path_release(&nd);
@@ -2247,7 +2242,7 @@ asmlinkage long sys_symlinkat(const char
int error = 0;
char * from;
char * to;
- struct dentry *dentry;
+ struct path path;
struct nameidata nd;
from = getname(oldname);
@@ -2261,13 +2256,12 @@ asmlinkage long sys_symlinkat(const char
error = do_path_lookup(newdfd, to, LOOKUP_PARENT, &nd);
if (error)
goto out;
- dentry = lookup_create(&nd, 0);
- error = PTR_ERR(dentry);
- if (IS_ERR(dentry))
+ error = lookup_create(&nd, 0, &path);
+ if (error)
goto out_unlock;
- error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO);
- dput(dentry);
+ error = vfs_symlink(nd.dentry->d_inode, path.dentry, from, S_IALLUGO);
+ dput_path(&path, &nd);
out_unlock:
mutex_unlock(&nd.dentry->d_inode->i_mutex);
path_release(&nd);
@@ -2334,7 +2328,7 @@ asmlinkage long sys_linkat(int olddfd, c
int newdfd, const char __user *newname,
int flags)
{
- struct dentry *new_dentry;
+ struct path path;
struct nameidata nd, old_nd;
int error;
char * to;
@@ -2357,12 +2351,11 @@ asmlinkage long sys_linkat(int olddfd, c
error = -EXDEV;
if (old_nd.mnt != nd.mnt)
goto out_release;
- new_dentry = lookup_create(&nd, 0);
- error = PTR_ERR(new_dentry);
- if (IS_ERR(new_dentry))
+ error = lookup_create(&nd, 0, &path);
+ if (error)
goto out_unlock;
- error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
- dput(new_dentry);
+ error = vfs_link(old_nd.dentry, nd.dentry->d_inode, path.dentry);
+ dput_path(&path, &nd);
out_unlock:
mutex_unlock(&nd.dentry->d_inode->i_mutex);
out_release:
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -358,7 +358,6 @@ static inline int d_mountpoint(struct de
extern struct vfsmount *lookup_mnt(struct vfsmount *, struct dentry *);
extern struct vfsmount *__lookup_mnt(struct vfsmount *, struct dentry *, int);
-extern struct dentry *lookup_create(struct nameidata *nd, int is_dir);
extern int sysctl_vfs_cache_pressure;
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -91,6 +91,7 @@ static inline struct dentry *lookup_one_
{
return lookup_one_len_nd(name, dir, len, NULL);
}
+extern int lookup_create(struct nameidata *, int, struct path *);
extern int follow_down(struct vfsmount **, struct dentry **);
extern int follow_up(struct vfsmount **, struct dentry **);
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -749,8 +749,8 @@ static int unix_bind(struct socket *sock
struct sock *sk = sock->sk;
struct unix_sock *u = unix_sk(sk);
struct sockaddr_un *sunaddr=(struct sockaddr_un *)uaddr;
- struct dentry * dentry = NULL;
struct nameidata nd;
+ struct path path;
int err;
unsigned hash;
struct unix_address *addr;
@@ -797,9 +797,8 @@ static int unix_bind(struct socket *sock
if (err)
goto out_mknod_parent;
- dentry = lookup_create(&nd, 0);
- err = PTR_ERR(dentry);
- if (IS_ERR(dentry))
+ err = lookup_create(&nd, 0, &path);
+ if (err)
goto out_mknod_unlock;
/*
@@ -807,12 +806,11 @@ static int unix_bind(struct socket *sock
*/
mode = S_IFSOCK |
(SOCK_INODE(sock)->i_mode & ~current->fs->umask);
- err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);
+ err = vfs_mknod(nd.dentry->d_inode, path.dentry, mode, 0);
if (err)
goto out_mknod_dput;
mutex_unlock(&nd.dentry->d_inode->i_mutex);
- dput(nd.dentry);
- nd.dentry = dentry;
+ path_to_nameidata(&path, &nd);
addr->hash = UNIX_HASH_SIZE;
}
@@ -829,7 +827,8 @@ static int unix_bind(struct socket *sock
list = &unix_socket_table[addr->hash];
} else {
- list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
+ list = &unix_socket_table[nd.dentry->d_inode->i_ino &
+ (UNIX_HASH_SIZE-1)];
u->dentry = nd.dentry;
u->mnt = nd.mnt;
}
@@ -847,7 +846,7 @@ out:
return err;
out_mknod_dput:
- dput(dentry);
+ dput_path(&path, &nd);
out_mknod_unlock:
mutex_unlock(&nd.dentry->d_inode->i_mutex);
path_release(&nd);
--
next prev parent reply other threads:[~2007-07-30 16:21 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-30 16:13 [RFC 00/26] VFS based Union Mount (V2) Jan Blunck
2007-07-30 16:13 ` [RFC 01/26] [PATCH 14/18] shmem: convert to using splice instead of sendfile() Jan Blunck
2007-07-30 16:13 ` [RFC 02/26] VFS: Export dput_path() and path_to_nameidata() Jan Blunck
2007-07-30 16:13 ` [RFC 03/26] VFS: Make lookup_hash() return a struct path Jan Blunck
2007-07-30 16:13 ` Jan Blunck [this message]
2007-07-30 16:13 ` [RFC 05/26] VFS: cache_lookup() cleanup Jan Blunck
2007-07-30 16:13 ` [RFC 06/26] VFS: Make real_lookup() return a struct path Jan Blunck
2007-07-30 16:13 ` [RFC 07/26] VFS: Introduce dput() variante that maintains a kill-list Jan Blunck
2007-07-30 16:13 ` [RFC 08/26] VFS: Export lives_below_in_same_fs() Jan Blunck
2007-07-30 16:13 ` [RFC 09/26] linux/stat.h: Add the filetype white-out Jan Blunck
2007-07-30 16:13 ` [RFC 10/26] VFS white-out handling Jan Blunck
2007-07-30 16:13 ` [RFC 11/26] tmpfs white-out support Jan Blunck
2007-08-01 15:13 ` Hugh Dickins
2007-08-02 2:48 ` Matt Mackall
2007-07-30 16:13 ` [RFC 12/26] ext2 " Jan Blunck
2007-07-31 3:45 ` Theodore Tso
2007-07-31 7:44 ` Jan Blunck
2007-07-31 8:32 ` Andreas Dilger
2007-07-31 9:08 ` Jan Blunck
2007-07-31 10:53 ` Theodore Tso
2007-08-02 19:31 ` Pavel Machek
2007-07-31 16:36 ` Josef Sipek
2007-07-31 17:00 ` Jan Blunck
2007-07-31 17:11 ` Josef Sipek
2007-08-01 15:23 ` Dave Kleikamp
2007-08-01 18:44 ` Josef Sipek
2007-08-01 19:10 ` Dave Kleikamp
2007-08-01 19:33 ` Josef Sipek
2007-08-01 19:52 ` Dave Kleikamp
2007-08-01 22:06 ` Erez Zadok
2007-08-02 12:05 ` Jan Blunck
2007-08-02 11:55 ` Jan Blunck
2007-08-02 17:50 ` Jörn Engel
2007-08-02 18:15 ` Jeremy Maitin-Shepard
2007-08-02 5:24 ` Ph. Marek
2007-08-02 12:12 ` Jan Blunck
2007-08-02 10:26 ` Jan Blunck
2007-08-01 10:00 ` Hans-Peter Jansen
2007-08-01 11:43 ` Josef Sipek
2007-08-01 18:01 ` Jan Engelhardt
2007-07-31 17:03 ` Mark Williamson
2007-07-31 17:16 ` Josef Sipek
2007-08-01 17:58 ` Jan Engelhardt
2007-08-01 18:03 ` Josef Sipek
2007-07-30 16:13 ` [RFC 13/26] ext3 whiteout support Jan Blunck
2007-07-30 16:13 ` [RFC 14/26] union-mount: Documentation Jan Blunck
2007-07-30 16:13 ` [RFC 15/26] union-mount: Add union-mount mount flag Jan Blunck
2007-07-30 16:13 ` [RFC 16/26] union-mount: Introduce union_mount structure Jan Blunck
2007-08-06 5:57 ` Bharata B Rao
2007-07-30 16:13 ` [RFC 17/26] union-mount: Drive the union cache via dcache Jan Blunck
2007-07-30 16:13 ` [RFC 18/26] union-mount: Changes to the namespace handling Jan Blunck
2007-08-08 10:10 ` Bharata B Rao
2007-07-30 16:13 ` [RFC 19/26] union-mount: Make lookup work for union-mounted file systems Jan Blunck
2007-08-09 5:42 ` Bharata B Rao
2007-07-30 16:13 ` [RFC 20/26] union-mount: Simple union-mount readdir implementation Jan Blunck
2007-08-06 11:08 ` Bharata B Rao
2007-07-30 16:13 ` [RFC 21/26] union-mount: in-kernel file copy between union mounted filesystems Jan Blunck
2007-07-30 16:13 ` [RFC 22/26] union-mount: white-out changes for copy-on-open Jan Blunck
2007-07-30 16:13 ` [RFC 23/26] union-mount: copyup on rename Jan Blunck
2007-07-30 16:13 ` [RFC 24/26] union-mount: dont report EROFS for union mounts Jan Blunck
2007-07-30 16:13 ` [RFC 25/26] union-mount: Debug Infrastructure Jan Blunck
2007-07-30 16:13 ` [RFC 26/26] union-mount: Debug code Jan Blunck
2007-07-30 18:23 ` [RFC 00/26] VFS based Union Mount (V2) Al Boldi
2007-08-02 6:49 ` Bharata B Rao
2007-08-02 10:17 ` Jan Blunck
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=20070730161323.507965230@weierstrass.suse.de \
--to=jblunck@suse.de \
--cc=bharata@linux.vnet.ibm.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®