diff options
Diffstat (limited to 'fs/gfs2/file.c')
-rw-r--r-- | fs/gfs2/file.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 7f4ed3daa38c..80dd44dca028 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c | |||
@@ -914,26 +914,6 @@ out_uninit: | |||
914 | #ifdef CONFIG_GFS2_FS_LOCKING_DLM | 914 | #ifdef CONFIG_GFS2_FS_LOCKING_DLM |
915 | 915 | ||
916 | /** | 916 | /** |
917 | * gfs2_setlease - acquire/release a file lease | ||
918 | * @file: the file pointer | ||
919 | * @arg: lease type | ||
920 | * @fl: file lock | ||
921 | * | ||
922 | * We don't currently have a way to enforce a lease across the whole | ||
923 | * cluster; until we do, disable leases (by just returning -EINVAL), | ||
924 | * unless the administrator has requested purely local locking. | ||
925 | * | ||
926 | * Locking: called under i_lock | ||
927 | * | ||
928 | * Returns: errno | ||
929 | */ | ||
930 | |||
931 | static int gfs2_setlease(struct file *file, long arg, struct file_lock **fl) | ||
932 | { | ||
933 | return -EINVAL; | ||
934 | } | ||
935 | |||
936 | /** | ||
937 | * gfs2_lock - acquire/release a posix lock on a file | 917 | * gfs2_lock - acquire/release a posix lock on a file |
938 | * @file: the file pointer | 918 | * @file: the file pointer |
939 | * @cmd: either modify or retrieve lock state, possibly wait | 919 | * @cmd: either modify or retrieve lock state, possibly wait |
@@ -1078,7 +1058,7 @@ const struct file_operations gfs2_file_fops = { | |||
1078 | .flock = gfs2_flock, | 1058 | .flock = gfs2_flock, |
1079 | .splice_read = generic_file_splice_read, | 1059 | .splice_read = generic_file_splice_read, |
1080 | .splice_write = iter_file_splice_write, | 1060 | .splice_write = iter_file_splice_write, |
1081 | .setlease = gfs2_setlease, | 1061 | .setlease = simple_nosetlease, |
1082 | .fallocate = gfs2_fallocate, | 1062 | .fallocate = gfs2_fallocate, |
1083 | }; | 1063 | }; |
1084 | 1064 | ||