aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Cheng <crquan@gmail.com>2008-02-26 02:25:03 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2008-03-31 05:41:20 -0400
commitd83225d45d2b76175279abb2a3d7ee325a09aba8 (patch)
treee6fc40998a7e7e0c7a22b2e0f29149ad47e0e2b0
parent7dc2cf1c8ffbd471722f1aa479bc68d4df1c9edc (diff)
[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>
-rw-r--r--fs/gfs2/inode.c2
-rw-r--r--fs/gfs2/ops_inode.c10
-rw-r--r--fs/gfs2/ops_inode.h1
3 files changed, 1 insertions, 12 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 810ff023fb14..7b9f31e5d6d3 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -149,7 +149,7 @@ void gfs2_set_iop(struct inode *inode)
149 } else if (S_ISLNK(mode)) { 149 } else if (S_ISLNK(mode)) {
150 inode->i_op = &gfs2_symlink_iops; 150 inode->i_op = &gfs2_symlink_iops;
151 } else { 151 } else {
152 inode->i_op = &gfs2_dev_iops; 152 inode->i_op = &gfs2_file_iops;
153 } 153 }
154 154
155 unlock_new_inode(inode); 155 unlock_new_inode(inode);
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index af7097a514c1..6cbbb5b46ce4 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -1149,16 +1149,6 @@ const struct inode_operations gfs2_file_iops = {
1149 .removexattr = gfs2_removexattr, 1149 .removexattr = gfs2_removexattr,
1150}; 1150};
1151 1151
1152const struct inode_operations gfs2_dev_iops = {
1153 .permission = gfs2_permission,
1154 .setattr = gfs2_setattr,
1155 .getattr = gfs2_getattr,
1156 .setxattr = gfs2_setxattr,
1157 .getxattr = gfs2_getxattr,
1158 .listxattr = gfs2_listxattr,
1159 .removexattr = gfs2_removexattr,
1160};
1161
1162const struct inode_operations gfs2_dir_iops = { 1152const struct inode_operations gfs2_dir_iops = {
1163 .create = gfs2_create, 1153 .create = gfs2_create,
1164 .lookup = gfs2_lookup, 1154 .lookup = gfs2_lookup,
diff --git a/fs/gfs2/ops_inode.h b/fs/gfs2/ops_inode.h
index fd8cee231e1d..14b4b797622a 100644
--- a/fs/gfs2/ops_inode.h
+++ b/fs/gfs2/ops_inode.h
@@ -15,7 +15,6 @@
15extern const struct inode_operations gfs2_file_iops; 15extern const struct inode_operations gfs2_file_iops;
16extern const struct inode_operations gfs2_dir_iops; 16extern const struct inode_operations gfs2_dir_iops;
17extern const struct inode_operations gfs2_symlink_iops; 17extern const struct inode_operations gfs2_symlink_iops;
18extern const struct inode_operations gfs2_dev_iops;
19extern const struct file_operations gfs2_file_fops; 18extern const struct file_operations gfs2_file_fops;
20extern const struct file_operations gfs2_dir_fops; 19extern const struct file_operations gfs2_dir_fops;
21extern const struct file_operations gfs2_file_fops_nolock; 20extern const struct file_operations gfs2_file_fops_nolock;