diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-02 10:50:05 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-10 22:18:28 -0400 |
| commit | ac194dccd2395a51b106c9b0aab7310fa6946b0a (patch) | |
| tree | 80438fa769570348a609ebe7e61e1bb187326f14 /fs | |
| parent | a5ef103daad25f5906700cb0929ce4eac7f72e2e (diff) | |
| download | linux-ac194dccd2395a51b106c9b0aab7310fa6946b0a.tar.gz linux-ac194dccd2395a51b106c9b0aab7310fa6946b0a.tar.bz2 linux-ac194dccd2395a51b106c9b0aab7310fa6946b0a.zip | |
ceph: switch to simple_follow_link()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/inode.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index e876e1944519..571acd88606c 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -6,7 +6,6 @@ #include <linux/string.h> #include <linux/uaccess.h> #include <linux/kernel.h> -#include <linux/namei.h> #include <linux/writeback.h> #include <linux/vmalloc.h> #include <linux/posix_acl.h> @@ -819,6 +818,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page, else kfree(sym); /* lost a race */ } + inode->i_link = ci->i_symlink; break; case S_IFDIR: inode->i_op = &ceph_dir_iops; @@ -1691,16 +1691,9 @@ retry: /* * symlinks */ -static void *ceph_sym_follow_link(struct dentry *dentry, struct nameidata *nd) -{ - struct ceph_inode_info *ci = ceph_inode(d_inode(dentry)); - nd_set_link(nd, ci->i_symlink); - return NULL; -} - static const struct inode_operations ceph_symlink_iops = { .readlink = generic_readlink, - .follow_link = ceph_sym_follow_link, + .follow_link = simple_follow_link, .setattr = ceph_setattr, .getattr = ceph_getattr, .setxattr = ceph_setxattr, |