---

yaml --- r: 38859 b: refs/heads/master c: 07903c0 h: refs/heads/master i: 38857: 81674fd 38855: 1633ede v: v3
git-mirror · Sep 18, 2006 · ed38e60 · ed38e60
1 parent e75cdb2
commit ed38e60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc41aeedef6b776583064be8abe6813159b4901d
+refs/heads/master: 07903c02d056452da369595f00eac078bf4c7ef0
diff --git a/trunk/fs/gfs2/ops_address.c b/trunk/fs/gfs2/ops_address.c
@@ -247,8 +247,7 @@ static int gfs2_readpage(struct file *file, struct page *page)
 	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);
 	}