lkml.org 
[lkml]   [2015]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 019/110] ceph: switch to simple_follow_link()
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    ---
    fs/ceph/inode.c | 11 ++---------
    1 file changed, 2 insertions(+), 9 deletions(-)

    diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
    index e876e19..571acd8 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,
    --
    2.1.4


    \
     
     \ /
      Last update: 2015-05-11 21:21    [W:2.322 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site