From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Jonghwan Choi To: 'Jonghwan Choi' , linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, 'Steven Whitehouse' References: In-reply-to: Subject: [PATCH 3.8-stable] GFS2: Fix unlock of fcntl locks during withdrawn state Date: Thu, 11 Apr 2013 11:05:18 +0900 Message-id: <000601ce3659$042adbf0$0c8093d0$%choi@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit Content-language: ko Sender: linux-kernel-owner@vger.kernel.org List-ID: This patch looks like it should be in the 3.8-stable tree, should we apply it? ------------------ From: "Steven Whitehouse " commit c2952d202f710d326ac36a8ea6bd216b20615ec8 upstream When withdraw occurs, we need to continue to allow unlocks of fcntl locks to occur, however these will only be local, since the node has withdrawn from the cluster. This prevents triggering a VFS level bug trap due to locks remaining when a file is closed. Signed-off-by: Steven Whitehouse Signed-off-by: Jonghwan Choi --- fs/gfs2/file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 991ab2d..7af426b 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -924,8 +924,11 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl) cmd = F_SETLK; fl->fl_type = F_UNLCK; } - if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) + if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) { + if (fl->fl_type == F_UNLCK) + posix_lock_file_wait(file, fl); return -EIO; + } if (IS_GETLK(cmd)) return dlm_posix_get(ls->ls_dlm, ip->i_no_addr, file, fl); else if (fl->fl_type == F_UNLCK) -- 1.7.9.5