summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Whitehouse2006-09-18 23:30:05 +0200
committerSteven Whitehouse2006-09-18 23:30:05 +0200
commit07903c02d056452da369595f00eac078bf4c7ef0 (patch)
tree240394ea3ef928657afeedda1383b73bb25afbdc
parent[GFS2] Fix for mmap() bug in readpage (diff)
downloadkernel-qcow2-linux-07903c02d056452da369595f00eac078bf4c7ef0.tar.gz
kernel-qcow2-linux-07903c02d056452da369595f00eac078bf4c7ef0.tar.xz
kernel-qcow2-linux-07903c02d056452da369595f00eac078bf4c7ef0.zip
[GFS2] Tweek unlock test in readpage()
This make the unlock test a bit simpler. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/ops_address.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index 25d7025e43c2..7cd53d118c89 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);
}