From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.99]:49126 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726358AbeKEVi2 (ORCPT ); Mon, 5 Nov 2018 16:38:28 -0500 Message-ID: Subject: Re: [PATCH 04/12] gfs2: properly initial file_lock used for unlock. From: Jeff Layton To: NeilBrown , Alexander Viro Cc: "J. Bruce Fields" , Martin Wilck , linux-fsdevel@vger.kernel.org, Frank Filz , linux-kernel@vger.kernel.org Date: Mon, 05 Nov 2018 07:18:56 -0500 In-Reply-To: <154138144777.31651.4516223215037533891.stgit@noble> References: <154138128401.31651.1381177427603557514.stgit@noble> <154138144777.31651.4516223215037533891.stgit@noble> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Mon, 2018-11-05 at 12:30 +1100, NeilBrown wrote: > 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 > --- > fs/gfs2/file.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c > index 45a17b770d97..271f847705e3 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_UNLOCK; F_UNLCK ? The ocfs2 patch has the same bug. > + request.fl_flags = FL_FLOCK; > + locks_lock_file_wait(file, &request); > gfs2_glock_dq(fl_gh); > gfs2_holder_reinit(state, flags, fl_gh); > } else { > > -- Jeff Layton