remove gfs2_dev_iops
PATCH 1/2 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.
--- fs/gfs2/inode.c | 2 +- fs/gfs2/ops_inode.c | 10 ---------- fs/gfs2/ops_inode.h | 1 - 3 files changed, 1 insertions(+), 12 deletions(-)
fs/gfs2/inode.c +1 -1
@@ -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);
fs/gfs2/ops_inode.c +0 -10
@@ -1148,16 +1148,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,
fs/gfs2/ops_inode.h +0 -1
@@ -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;
Signature · 1 line
1.5.4.2
PATCH 2/2 re-support special inode
commit feaa7bba026c181ce071d5a4884f7f9dd26207a1 removed call to init_special_inode from inode lookuping, this cause problems as:
# mknod /mnt/gfs2/dev/null c 1 3 # cat /mnt/gfs2/dev/null cat: /mnt/gfs2/dev/null: Invalid argument
without special inode, GFS2 cannot support char device file, block device file, fifo pipe, and socket file, lose many important features as a common file system.
this one line patch re add special inode support.
--- fs/gfs2/inode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
fs/gfs2/inode.c +1 -0
@@ -150,6 +150,7 @@ void gfs2_set_iop(struct inode *inode) inode->i_op = &gfs2_symlink_iops; }else { inode->i_op = &gfs2_file_iops; +init_special_inode (inode, inode->i_mode, inode->i_rdev); }unlock_new_inode (inode);
Signature · 1 line
1.5.4.2
Hi,
Both patches are now in the -nmw git tree. Sorry for the delay. I've changed the comment on the second one since that commit ID didn't appear to match up with the right patch.
Steve.
Quoted 58 lines · Denis Cheng
struct
inode_operationsgfs2_dev_iopsis always the same asgfs2_file_iops, since Jan 2006, when GFS2 merged into mainstream kernel.So one of them could be removed.
Signed-off-by Denis Cheng <[email protected]>--- fs/gfs2/inode.c | 2 +- fs/gfs2/ops_inode.c | 10 ---------- fs/gfs2/ops_inode.h | 1 - 3 files changed, 1 insertions(+), 12 deletions(-)fs/gfs2/inode.c +1
-1@@ -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);fs/gfs2/ops_inode.c +0
-10@@ -1148,16 +1148,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,fs/gfs2/ops_inode.h +0
-1@@ -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;