gfs2: properly initial file_lock used for unlock.

Rather than assuming all-zeros is sufficient, use the available API to
initialize the file_lock structure use for unlock.  VFS-level changes
will soon make it important that the list_heads in file_lock are
always properly initialized.

Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 45a17b770d97..a2dea5bc0427 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -1199,13 +1199,13 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)
         mutex_lock(&fp->f_fl_mutex);
 
         if (gfs2_holder_initialized(fl_gh)) {
+                struct file_lock request;
                 if (fl_gh->gh_state == state)
                         goto out;
-                locks_lock_file_wait(file,
-                                     &(struct file_lock) {
-                                             .fl_type = F_UNLCK,
-                                             .fl_flags = FL_FLOCK
-                                     });
+                locks_init_lock(&request);
+                request.fl_type = F_UNLCK;
+                request.fl_flags = FL_FLOCK;
+                locks_lock_file_wait(file, &request);
                 gfs2_glock_dq(fl_gh);
                 gfs2_holder_reinit(state, flags, fl_gh);
         } else {