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>
This commit is contained in:

committed by
Steven Whitehouse

parent
a228df6339
commit
10d2198805
@@ -705,7 +705,7 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
|
||||
}
|
||||
}
|
||||
|
||||
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_fops = &(const struct file_operations){
|
||||
.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_fops = &(const struct file_operations){
|
||||
|
||||
#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_fops_nolock = &(const struct file_operat
|
||||
.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,
|
||||
|
Reference in New Issue
Block a user