lkml.org 
[lkml]   [2015]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 02/11] logfs: don't duplicate page_symlink_inode_operations
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    ---
    fs/logfs/dir.c | 8 +-------
    fs/logfs/inode.c | 2 +-
    fs/logfs/logfs.h | 1 -
    3 files changed, 2 insertions(+), 9 deletions(-)

    diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
    index f9b45d4..99944a4 100644
    --- a/fs/logfs/dir.c
    +++ b/fs/logfs/dir.c
    @@ -528,7 +528,7 @@ static int logfs_symlink(struct inode *dir, struct dentry *dentry,
    if (IS_ERR(inode))
    return PTR_ERR(inode);

    - inode->i_op = &logfs_symlink_iops;
    + inode->i_op = &page_symlink_inode_operations;
    inode->i_mapping->a_ops = &logfs_reg_aops;

    return __logfs_create(dir, dentry, inode, target, destlen);
    @@ -776,12 +776,6 @@ fail:
    return -EIO;
    }

    -const struct inode_operations logfs_symlink_iops = {
    - .readlink = generic_readlink,
    - .follow_link = page_follow_link_light,
    - .put_link = page_put_link,
    -};
    -
    const struct inode_operations logfs_dir_iops = {
    .create = logfs_create,
    .link = logfs_link,
    diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c
    index af49e2d..06baa92 100644
    --- a/fs/logfs/inode.c
    +++ b/fs/logfs/inode.c
    @@ -64,7 +64,7 @@ static void logfs_inode_setops(struct inode *inode)
    inode->i_mapping->a_ops = &logfs_reg_aops;
    break;
    case S_IFLNK:
    - inode->i_op = &logfs_symlink_iops;
    + inode->i_op = &page_symlink_inode_operations;
    inode->i_mapping->a_ops = &logfs_reg_aops;
    break;
    case S_IFSOCK: /* fall through */
    diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h
    index 5f09376..209a26d 100644
    --- a/fs/logfs/logfs.h
    +++ b/fs/logfs/logfs.h
    @@ -495,7 +495,6 @@ static inline int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr)
    #endif

    /* dir.c */
    -extern const struct inode_operations logfs_symlink_iops;
    extern const struct inode_operations logfs_dir_iops;
    extern const struct file_operations logfs_dir_fops;
    int logfs_replay_journal(struct super_block *sb);
    --
    2.1.4


    \
     
     \ /
      Last update: 2015-12-09 07:21    [W:6.190 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site