diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-02-16 15:15:47 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-14 09:15:23 -0400 |
commit | c9c6cac0c2bdbda42e7b804838648d0bc60ddb13 (patch) | |
tree | c2d9b41eb24026d6769175e9ba3c17c8093b6aad /fs | |
parent | 15a9155fe3e8215c02b80df51ec2cac7c0d726ad (diff) |
kill path_lookup()
all remaining callers pass LOOKUP_PARENT to it, so
flags argument can die; renamed to kern_path_parent()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/namei.c | 7 | ||||
-rw-r--r-- | fs/ocfs2/refcounttree.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/fs/namei.c b/fs/namei.c index a4689eb2df28..1d6bc8151553 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -1747,10 +1747,9 @@ static int do_path_lookup(int dfd, const char *name, | |||
1747 | return retval; | 1747 | return retval; |
1748 | } | 1748 | } |
1749 | 1749 | ||
1750 | int path_lookup(const char *name, unsigned int flags, | 1750 | int kern_path_parent(const char *name, struct nameidata *nd) |
1751 | struct nameidata *nd) | ||
1752 | { | 1751 | { |
1753 | return do_path_lookup(AT_FDCWD, name, flags, nd); | 1752 | return do_path_lookup(AT_FDCWD, name, LOOKUP_PARENT, nd); |
1754 | } | 1753 | } |
1755 | 1754 | ||
1756 | int kern_path(const char *name, unsigned int flags, struct path *path) | 1755 | int kern_path(const char *name, unsigned int flags, struct path *path) |
@@ -3586,7 +3585,7 @@ EXPORT_SYMBOL(page_readlink); | |||
3586 | EXPORT_SYMBOL(__page_symlink); | 3585 | EXPORT_SYMBOL(__page_symlink); |
3587 | EXPORT_SYMBOL(page_symlink); | 3586 | EXPORT_SYMBOL(page_symlink); |
3588 | EXPORT_SYMBOL(page_symlink_inode_operations); | 3587 | EXPORT_SYMBOL(page_symlink_inode_operations); |
3589 | EXPORT_SYMBOL(path_lookup); | 3588 | EXPORT_SYMBOL(kern_path_parent); |
3590 | EXPORT_SYMBOL(kern_path); | 3589 | EXPORT_SYMBOL(kern_path); |
3591 | EXPORT_SYMBOL(vfs_path_lookup); | 3590 | EXPORT_SYMBOL(vfs_path_lookup); |
3592 | EXPORT_SYMBOL(inode_permission); | 3591 | EXPORT_SYMBOL(inode_permission); |
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index 19ebc5aad391..29623da133cc 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c | |||
@@ -4379,7 +4379,7 @@ static int ocfs2_user_path_parent(const char __user *path, | |||
4379 | if (IS_ERR(s)) | 4379 | if (IS_ERR(s)) |
4380 | return PTR_ERR(s); | 4380 | return PTR_ERR(s); |
4381 | 4381 | ||
4382 | error = path_lookup(s, LOOKUP_PARENT, nd); | 4382 | error = kern_path_parent(s, nd); |
4383 | if (error) | 4383 | if (error) |
4384 | putname(s); | 4384 | putname(s); |
4385 | else | 4385 | else |