[GFS2] remove gfs2_dev_iops

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 810ff023fb147bc4da497464aff09eb81e68717e..7b9f31e5d6d38d6f2d5d15c76eedbab76254f144 100644 (file)
--- 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 af7097a514c1066efcc3414bd64ef132b9dbe422..6cbbb5b46ce4b7a6712dcd04261fc52a0337823b 100644 (file)
--- 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 fd8cee231e1d87887081ffb2bc2ec4b0d15b03b3..14b4b797622a085449d3090b747de18c443fb965 100644 (file)
--- 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;