Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d62d3f7 authored by NeilBrown's avatar NeilBrown Committed by Jeff Layton
Browse files

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: default avatarNeilBrown <neilb@suse.com>
Reviewed-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
parent 7b587e1a

fs/gfs2/file.c

+5 −5
Original line number Diff line number Diff line
@@ -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 {