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 011/110] shmem: switch to simple_follow_link()
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    Reviewed-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    ---
    mm/shmem.c | 9 ++-------
    1 file changed, 2 insertions(+), 7 deletions(-)

    diff --git a/mm/shmem.c b/mm/shmem.c
    index de98137..7f6e2f8 100644
    --- a/mm/shmem.c
    +++ b/mm/shmem.c
    @@ -2451,6 +2451,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s
    return -ENOMEM;
    }
    inode->i_op = &shmem_short_symlink_operations;
    + inode->i_link = info->symlink;
    } else {
    error = shmem_getpage(inode, 0, &page, SGP_WRITE, NULL);
    if (error) {
    @@ -2474,12 +2475,6 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s
    return 0;
    }

    -static void *shmem_follow_short_symlink(struct dentry *dentry, struct nameidata *nd)
    -{
    - nd_set_link(nd, SHMEM_I(d_inode(dentry))->symlink);
    - return NULL;
    -}
    -
    static void *shmem_follow_link(struct dentry *dentry, struct nameidata *nd)
    {
    struct page *page = NULL;
    @@ -2642,7 +2637,7 @@ static ssize_t shmem_listxattr(struct dentry *dentry, char *buffer, size_t size)

    static const struct inode_operations shmem_short_symlink_operations = {
    .readlink = generic_readlink,
    - .follow_link = shmem_follow_short_symlink,
    + .follow_link = simple_follow_link,
    #ifdef CONFIG_TMPFS_XATTR
    .setxattr = shmem_setxattr,
    .getxattr = shmem_getxattr,
    --
    2.1.4


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