diff options
| author |   Christoph Hellwig <hch@lst.de> | 2009-04-07 19:42:17 +0200 |
|---|---|---|
| committer |   Steven Whitehouse <swhiteho@redhat.com> | 2009-04-15 10:17:18 +0100 |
| commit | 10d2198805d7faa2b193485446ff6b1de42c9b78 (patch) | |
| tree | be7e570d0c640aa8e544ee9e264a5f908b06e51c /fs/gfs2/inode.h | |
| parent | GFS2: Move umount flush rwsem (diff) | |
| download | linux-dev-10d2198805d7faa2b193485446ff6b1de42c9b78.tar.xz linux-dev-10d2198805d7faa2b193485446ff6b1de42c9b78.zip | |
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 <hch@lst.de>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/inode.h')
| -rw-r--r-- | fs/gfs2/inode.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h index dca4fee3078b..c30be2b66580 100644 --- a/fs/gfs2/inode.h +++ b/fs/gfs2/inode.h @@ -101,21 +101,23 @@ void gfs2_dinode_print(const struct gfs2_inode *ip); 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 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; |