gfs2: cleanup file_operations mess
PATCH 1/1 gfs2: cleanup file_operations mess
Remove the weird pointer to file_operations mess and replace it with straight-forward defining of the lockinginstance names to the _nolock variants.
Signed-off-by Christoph Hellwig <[email protected]>
fs/gfs2/inode.c +4 -4
@@ -137,15 +137,15 @@ void gfs2_set_iop(struct inode *inode)if (S_ISREG (mode)) { inode->i_op = &gfs2_file_iops;if (gfs2_localflocks (sdp)) - inode->i_fop = gfs2_file_fops_nolock; + inode->i_fop = &gfs2_file_fops_nolock;else - inode->i_fop = gfs2_file_fops; + inode->i_fop = &gfs2_file_fops; }else if (S_ISDIR (mode)) { inode->i_op = &gfs2_dir_iops;if (gfs2_localflocks (sdp)) - inode->i_fop = gfs2_dir_fops_nolock; + inode->i_fop = &gfs2_dir_fops_nolock;else - inode->i_fop = gfs2_dir_fops; + inode->i_fop = &gfs2_dir_fops; }else if (S_ISLNK (mode)) { inode->i_op = &gfs2_symlink_iops; }else {
fs/gfs2/inode.h +8 -6
@@ -101,21 +101,23 @@ void gfs2_dinode_print(const struct gfs2extern 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 file_operations *gfs2_file_fops_nolock; -extern const struct file_operations *gfs2_dir_fops_nolock; +extern const struct file_operations gfs2_file_fops_nolock; +extern const struct file_operations gfs2_dir_fops_nolock;extern void gfs2_set_inode_flags (struct inode *inode);#ifdef CONFIG_GFS2_FS_LOCKING_DLM -extern const struct file_operations *gfs2_file_fops; -extern const struct file_operations *gfs2_dir_fops; +extern const struct file_operations gfs2_file_fops; +extern const struct file_operations gfs2_dir_fops; +static inline int gfs2_localflocks (const struct gfs2_sbd *sdp) {return sdp->sd_args.ar_localflocks; }#else /* Single node only */ -#define gfs2_file_fops NULL -#define gfs2_dir_fops NULL +#define gfs2_file_fops gfs2_file_fops_nolock +#define gfs2_dir_fops gfs2_dir_fops_nolock +static inline int gfs2_localflocks (const struct gfs2_sbd *sdp) {return 1 ;
fs/gfs2/ops_file.c +4 -4
@@ -705,7 +705,7 @@ static int gfs2_flock(struct file *file, } } -const struct file_operations *gfs2_file_fops = &(const struct file_operations ){ +const struct file_operations gfs2_file_fops = { .llseek = gfs2_llseek, .read = do_sync_read, .aio_read = generic_file_aio_read,
@@ -723,7 +723,7 @@ const struct file_operations *gfs2_file_ .setlease = gfs2_setlease, }; -const struct file_operations *gfs2_dir_fops = &(const struct file_operations ){ +const struct file_operations gfs2_dir_fops = { .readdir = gfs2_readdir, .unlocked_ioctl = gfs2_ioctl, .open = gfs2_open,
@@ -735,7 +735,7 @@ const struct file_operations *gfs2_dir_f#endif /* CONFIG_GFS2_FS_LOCKING_DLM */ -const struct file_operations *gfs2_file_fops_nolock = &(const struct file_operations ){ +const struct file_operations gfs2_file_fops_nolock = { .llseek = gfs2_llseek, .read = do_sync_read, .aio_read = generic_file_aio_read,
@@ -751,7 +751,7 @@ const struct file_operations *gfs2_file_ .setlease = generic_setlease, }; -const struct file_operations *gfs2_dir_fops_nolock = &(const struct file_operations ){ +const struct file_operations gfs2_dir_fops_nolock = { .readdir = gfs2_readdir, .unlocked_ioctl = gfs2_ioctl, .open = gfs2_open,
Hi,
Yes, that looks better! Its about to appear in the GFS2 git tree. Thanks,
Steve.
Quoted 105 lines · Christoph Hellwig
Remove the weird pointer to
file_operationsmess and replace it with straight-forward defining of the lockinginstance names to the_nolockvariants.Signed-off-by Christoph Hellwig <[email protected]>Index:
linux-2.6/fs/gfs2/inode.c
===================================================================fs/gfs2/inode.c +4
-4@@ -137,15 +137,15 @@ void gfs2_set_iop(struct inode *inode)if (S_ISREG (mode)) { inode->i_op = &gfs2_file_iops;if (gfs2_localflocks (sdp)) - inode->i_fop = gfs2_file_fops_nolock; + inode->i_fop = &gfs2_file_fops_nolock;else - inode->i_fop = gfs2_file_fops; + inode->i_fop = &gfs2_file_fops; }else if (S_ISDIR (mode)) { inode->i_op = &gfs2_dir_iops;if (gfs2_localflocks (sdp)) - inode->i_fop = gfs2_dir_fops_nolock; + inode->i_fop = &gfs2_dir_fops_nolock;else - inode->i_fop = gfs2_dir_fops; + inode->i_fop = &gfs2_dir_fops; }else if (S_ISLNK (mode)) { inode->i_op = &gfs2_symlink_iops; }else {Index:
linux-2.6/fs/gfs2/inode.h
===================================================================fs/gfs2/inode.h +8
-6@@ -101,21 +101,23 @@ void gfs2_dinode_print(const struct gfs2extern 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 file_operations *gfs2_file_fops_nolock; -extern const struct file_operations *gfs2_dir_fops_nolock; +extern const struct file_operations gfs2_file_fops_nolock; +extern const struct file_operations gfs2_dir_fops_nolock;extern void gfs2_set_inode_flags (struct inode *inode);#ifdef CONFIG_GFS2_FS_LOCKING_DLM -extern const struct file_operations *gfs2_file_fops; -extern const struct file_operations *gfs2_dir_fops; +extern const struct file_operations gfs2_file_fops; +extern const struct file_operations gfs2_dir_fops; +static inline int gfs2_localflocks (const struct gfs2_sbd *sdp) {return sdp->sd_args.ar_localflocks; }#else /* Single node only */ -#define gfs2_file_fops NULL -#define gfs2_dir_fops NULL +#define gfs2_file_fops gfs2_file_fops_nolock +#define gfs2_dir_fops gfs2_dir_fops_nolock +static inline int gfs2_localflocks (const struct gfs2_sbd *sdp) {return 1 ;Index:
linux-2.6/fs/gfs2/ops_file.c
===================================================================fs/gfs2/ops_file.c +4
-4@@ -705,7 +705,7 @@ static int gfs2_flock(struct file *file, } } -const struct file_operations *gfs2_file_fops = &(const struct file_operations ){ +const struct file_operations gfs2_file_fops = { .llseek = gfs2_llseek, .read = do_sync_read, .aio_read = generic_file_aio_read,@@ -723,7 +723,7 @@ const struct file_operations *gfs2_file_ .setlease = gfs2_setlease, }; -const struct file_operations *gfs2_dir_fops = &(const struct file_operations ){ +const struct file_operations gfs2_dir_fops = { .readdir = gfs2_readdir, .unlocked_ioctl = gfs2_ioctl, .open = gfs2_open,@@ -735,7 +735,7 @@ const struct file_operations *gfs2_dir_f#endif /* CONFIG_GFS2_FS_LOCKING_DLM */ -const struct file_operations *gfs2_file_fops_nolock = &(const struct file_operations ){ +const struct file_operations gfs2_file_fops_nolock = { .llseek = gfs2_llseek, .read = do_sync_read, .aio_read = generic_file_aio_read,@@ -751,7 +751,7 @@ const struct file_operations *gfs2_file_ .setlease = generic_setlease, }; -const struct file_operations *gfs2_dir_fops_nolock = &(const struct file_operations ){ +const struct file_operations gfs2_dir_fops_nolock = { .readdir = gfs2_readdir, .unlocked_ioctl = gfs2_ioctl, .open = gfs2_open,