lkml.org 
[lkml]   [2008]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 37/48] [GFS2] remove gfs2_dev_iops
    Date
    From: Denis Cheng <crquan@gmail.com>

    struct inode_operations gfs2_dev_iops is always the same as gfs2_file_iops,
    since Jan 2006, when GFS2 merged into mainstream kernel.

    So one of them could be removed.

    Signed-off-by: Denis Cheng <crquan@gmail.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

    diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
    index 810ff02..7b9f31e 100644
    --- a/fs/gfs2/inode.c
    +++ b/fs/gfs2/inode.c
    @@ -149,7 +149,7 @@ void gfs2_set_iop(struct inode *inode)
    } else if (S_ISLNK(mode)) {
    inode->i_op = &gfs2_symlink_iops;
    } else {
    - inode->i_op = &gfs2_dev_iops;
    + inode->i_op = &gfs2_file_iops;
    }

    unlock_new_inode(inode);
    diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
    index af7097a..6cbbb5b 100644
    --- a/fs/gfs2/ops_inode.c
    +++ b/fs/gfs2/ops_inode.c
    @@ -1149,16 +1149,6 @@ const struct inode_operations gfs2_file_iops = {
    .removexattr = gfs2_removexattr,
    };

    -const struct inode_operations gfs2_dev_iops = {
    - .permission = gfs2_permission,
    - .setattr = gfs2_setattr,
    - .getattr = gfs2_getattr,
    - .setxattr = gfs2_setxattr,
    - .getxattr = gfs2_getxattr,
    - .listxattr = gfs2_listxattr,
    - .removexattr = gfs2_removexattr,
    -};
    -
    const struct inode_operations gfs2_dir_iops = {
    .create = gfs2_create,
    .lookup = gfs2_lookup,
    diff --git a/fs/gfs2/ops_inode.h b/fs/gfs2/ops_inode.h
    index fd8cee2..14b4b79 100644
    --- a/fs/gfs2/ops_inode.h
    +++ b/fs/gfs2/ops_inode.h
    @@ -15,7 +15,6 @@
    extern const struct inode_operations gfs2_file_iops;
    extern const struct inode_operations gfs2_dir_iops;
    extern const struct inode_operations gfs2_symlink_iops;
    -extern const struct inode_operations gfs2_dev_iops;
    extern const struct file_operations gfs2_file_fops;
    extern const struct file_operations gfs2_dir_fops;
    extern const struct file_operations gfs2_file_fops_nolock;
    --
    1.5.1.2


    \
     
     \ /
      Last update: 2008-04-17 11:55    [W:2.529 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site