lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/79] ubifs: 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/ubifs/dir.c | 1 +
    fs/ubifs/file.c | 11 +----------
    fs/ubifs/super.c | 1 +
    3 files changed, 3 insertions(+), 10 deletions(-)

    diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
    index 27060fc..5c27c66 100644
    --- a/fs/ubifs/dir.c
    +++ b/fs/ubifs/dir.c
    @@ -889,6 +889,7 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry,

    memcpy(ui->data, symname, len);
    ((char *)ui->data)[len] = '\0';
    + inode->i_link = ui->data;
    /*
    * The terminating zero byte is not written to the flash media and it
    * is put just to make later in-memory string processing simpler. Thus,
    diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
    index 35efc10..a3dfe2a 100644
    --- a/fs/ubifs/file.c
    +++ b/fs/ubifs/file.c
    @@ -51,7 +51,6 @@

    #include "ubifs.h"
    #include <linux/mount.h>
    -#include <linux/namei.h>
    #include <linux/slab.h>

    static int read_block(struct inode *inode, void *addr, unsigned int block,
    @@ -1300,14 +1299,6 @@ static void ubifs_invalidatepage(struct page *page, unsigned int offset,
    ClearPageChecked(page);
    }

    -static void *ubifs_follow_link(struct dentry *dentry, struct nameidata *nd)
    -{
    - struct ubifs_inode *ui = ubifs_inode(d_inode(dentry));
    -
    - nd_set_link(nd, ui->data);
    - return NULL;
    -}
    -
    int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
    {
    struct inode *inode = file->f_mapping->host;
    @@ -1570,7 +1561,7 @@ const struct inode_operations ubifs_file_inode_operations = {

    const struct inode_operations ubifs_symlink_inode_operations = {
    .readlink = generic_readlink,
    - .follow_link = ubifs_follow_link,
    + .follow_link = simple_follow_link,
    .setattr = ubifs_setattr,
    .getattr = ubifs_getattr,
    .setxattr = ubifs_setxattr,
    diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
    index 75e6f04..20f5dbd 100644
    --- a/fs/ubifs/super.c
    +++ b/fs/ubifs/super.c
    @@ -195,6 +195,7 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum)
    }
    memcpy(ui->data, ino->data, ui->data_len);
    ((char *)ui->data)[ui->data_len] = '\0';
    + inode->i_link = ui->data;
    break;
    case S_IFBLK:
    case S_IFCHR:
    --
    2.1.4


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