aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/gfs2/file.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 860408053c95..7412863cda1e 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -1027,7 +1027,10 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)
1027 if (fl_gh->gh_state == state) 1027 if (fl_gh->gh_state == state)
1028 goto out; 1028 goto out;
1029 locks_lock_file_wait(file, 1029 locks_lock_file_wait(file,
1030 &(struct file_lock){.fl_type = F_UNLCK}); 1030 &(struct file_lock) {
1031 .fl_type = F_UNLCK,
1032 .fl_flags = FL_FLOCK
1033 });
1031 gfs2_glock_dq(fl_gh); 1034 gfs2_glock_dq(fl_gh);
1032 gfs2_holder_reinit(state, flags, fl_gh); 1035 gfs2_holder_reinit(state, flags, fl_gh);
1033 } else { 1036 } else {