From: Steven Whitehouse <swhiteho@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: cluster-devel@redhat.com, linux-kernel@vger.kernel.org
Subject: GFS2: Pull request (fixes)
Date: Mon, 28 Jan 2013 10:31:55 +0000 [thread overview]
Message-ID: <1359369115.2697.4.camel@menhir> (raw)
[-- Attachment #1: Type: text/plain, Size: 2068 bytes --]
Hi,
Please consider pulling the following fix. Since there is only one patch
this time, I've attached it below rather than posting it separately,
Steve.
------------------------------------------------------------------------------
The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
Linux 3.8-rc5 (2013-01-25 11:57:28 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes.git master
David Teigland (1):
GFS2: fix skip unlock condition
fs/gfs2/lock_dlm.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
------------------------------------------------------------------------------
From d4e0bfec9b6fbb9b58640b44e01bb74ae0d29b22 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Thu, 3 Jan 2013 17:52:07 -0500
Subject: [PATCH] GFS2: fix skip unlock condition
The recent commit fb6791d100d1bba20b5cdbc4912e1f7086ec60f8
included the wrong logic. The lvbptr check was incorrectly
added after the patch was tested.
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c
index b906ed1..9802de0 100644
--- a/fs/gfs2/lock_dlm.c
+++ b/fs/gfs2/lock_dlm.c
@@ -281,6 +281,7 @@ static void gdlm_put_lock(struct gfs2_glock *gl)
{
struct gfs2_sbd *sdp = gl->gl_sbd;
struct lm_lockstruct *ls = &sdp->sd_lockstruct;
+ int lvb_needs_unlock = 0;
int error;
if (gl->gl_lksb.sb_lkid == 0) {
@@ -294,8 +295,12 @@ static void gdlm_put_lock(struct gfs2_glock *gl)
gfs2_update_request_times(gl);
/* don't want to skip dlm_unlock writing the lvb when lock is ex */
+
+ if (gl->gl_lksb.sb_lvbptr && (gl->gl_state == LM_ST_EXCLUSIVE))
+ lvb_needs_unlock = 1;
+
if (test_bit(SDF_SKIP_DLM_UNLOCK, &sdp->sd_flags) &&
- gl->gl_lksb.sb_lvbptr && (gl->gl_state != LM_ST_EXCLUSIVE)) {
+ !lvb_needs_unlock) {
gfs2_glock_free(gl);
return;
}
--
1.7.4
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-01-28 10:33 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 10:31 Steven Whitehouse [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-09-16 10:11 GFS2: Pull request (fixes) Steven Whitehouse
2014-07-18 11:21 Steven Whitehouse
2014-01-02 12:41 Steven Whitehouse
2013-11-22 10:39 Steven Whitehouse
2013-08-19 9:26 Steven Whitehouse
2013-08-19 16:33 ` Linus Torvalds
2013-08-19 9:24 Steven Whitehouse
2013-06-04 15:40 Steven Whitehouse
2013-05-24 14:05 Steven Whitehouse
2013-04-05 10:34 Steven Whitehouse
2013-04-05 16:27 ` David Teigland
2013-04-05 16:51 ` Steven Whitehouse
2013-04-05 16:53 ` Linus Torvalds
2013-04-05 17:52 ` Steven Whitehouse
2013-01-03 12:28 Steven Whitehouse
2012-11-07 10:58 Steven Whitehouse
2012-09-13 13:42 Steven Whitehouse
2012-04-11 10:21 Steven Whitehouse
2012-04-11 10:18 Steven Whitehouse
2012-02-28 11:49 Steven Whitehouse
2011-07-27 10:00 Steven Whitehouse
2011-07-14 15:16 Steven Whitehouse
2011-05-23 14:05 Steven Whitehouse
2011-04-19 9:13 Steven Whitehouse
2011-01-19 10:50 Steven Whitehouse
2010-11-29 13:42 Steven Whitehouse
2010-11-15 15:41 Steven Whitehouse
2010-09-17 13:59 Steven Whitehouse
2010-07-15 14:35 Steven Whitehouse
2010-05-25 8:51 Steven Whitehouse
2010-03-11 17:41 Steven Whitehouse
2010-02-12 11:37 Steven Whitehouse
2010-02-04 10:06 Steven Whitehouse
2010-01-11 14:24 Steven Whitehouse
2009-08-14 13:01 Steven Whitehouse
2009-07-30 13:45 GFS2: Pre-pull patch posting (fixes) Steven Whitehouse
2009-07-30 13:02 ` GFS2: Pull request (fixes) Steven Whitehouse
2009-04-23 13:13 Steven Whitehouse
2009-01-07 10:21 Steven Whitehouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359369115.2697.4.camel@menhir \
--to=swhiteho@redhat.com \
--cc=cluster-devel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).