lkml.org 
[lkml]   [2014]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 18/22] ext2: Remove ext2_aops_xip
    Date
    We shouldn't need a special address_space_operations any more

    Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
    ---
    fs/ext2/ext2.h | 1 -
    fs/ext2/inode.c | 7 +------
    fs/ext2/namei.c | 4 ++--
    3 files changed, 3 insertions(+), 9 deletions(-)

    diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h
    index b30c3bd..b8b1c11 100644
    --- a/fs/ext2/ext2.h
    +++ b/fs/ext2/ext2.h
    @@ -793,7 +793,6 @@ extern const struct file_operations ext2_xip_file_operations;

    /* inode.c */
    extern const struct address_space_operations ext2_aops;
    -extern const struct address_space_operations ext2_aops_xip;
    extern const struct address_space_operations ext2_nobh_aops;

    /* namei.c */
    diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
    index 154cbcf..034fd42 100644
    --- a/fs/ext2/inode.c
    +++ b/fs/ext2/inode.c
    @@ -891,11 +891,6 @@ const struct address_space_operations ext2_aops = {
    .error_remove_page = generic_error_remove_page,
    };

    -const struct address_space_operations ext2_aops_xip = {
    - .bmap = ext2_bmap,
    - .direct_IO = ext2_direct_IO,
    -};
    -
    const struct address_space_operations ext2_nobh_aops = {
    .readpage = ext2_readpage,
    .readpages = ext2_readpages,
    @@ -1394,7 +1389,7 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
    if (S_ISREG(inode->i_mode)) {
    inode->i_op = &ext2_file_inode_operations;
    if (test_opt(inode->i_sb, XIP)) {
    - inode->i_mapping->a_ops = &ext2_aops_xip;
    + inode->i_mapping->a_ops = &ext2_aops;
    inode->i_fop = &ext2_xip_file_operations;
    } else if (test_opt(inode->i_sb, NOBH)) {
    inode->i_mapping->a_ops = &ext2_nobh_aops;
    diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
    index 7ca803f..0db888c 100644
    --- a/fs/ext2/namei.c
    +++ b/fs/ext2/namei.c
    @@ -105,7 +105,7 @@ static int ext2_create (struct inode * dir, struct dentry * dentry, umode_t mode

    inode->i_op = &ext2_file_inode_operations;
    if (test_opt(inode->i_sb, XIP)) {
    - inode->i_mapping->a_ops = &ext2_aops_xip;
    + inode->i_mapping->a_ops = &ext2_aops;
    inode->i_fop = &ext2_xip_file_operations;
    } else if (test_opt(inode->i_sb, NOBH)) {
    inode->i_mapping->a_ops = &ext2_nobh_aops;
    @@ -126,7 +126,7 @@ static int ext2_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)

    inode->i_op = &ext2_file_inode_operations;
    if (test_opt(inode->i_sb, XIP)) {
    - inode->i_mapping->a_ops = &ext2_aops_xip;
    + inode->i_mapping->a_ops = &ext2_aops;
    inode->i_fop = &ext2_xip_file_operations;
    } else if (test_opt(inode->i_sb, NOBH)) {
    inode->i_mapping->a_ops = &ext2_nobh_aops;
    --
    2.0.0


    \
     
     \ /
      Last update: 2014-07-22 22:21    [W:2.878 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site