From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 18 Sep 2006 21:30:05 +0000 (-0400)
Subject: [GFS2] Tweek unlock test in readpage()
X-Git-Tag: v2.6.19-rc1~32^2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07903c02d056452da369595f00eac078bf4c7ef0;p=profile%2Fivi%2Fkernel-x86-ivi.git

[GFS2] Tweek unlock test in readpage()

This make the unlock test a bit simpler.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---

diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index 25d7025..7cd53d1 100644
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -247,8 +247,7 @@ skip_lock:
 	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
 		error = -EIO;
 
-	if (gf && !test_bit(GFF_EXLOCK, &gf->f_flags) &&
-	    file != &gfs2_internal_file_sentinel) {
+	if (do_unlock) {
 		gfs2_glock_dq_m(1, &gh);
 		gfs2_holder_uninit(&gh);
 	}