From ed38e601970479f5644616763874ec0349341102 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Mon, 18 Sep 2006 17:30:05 -0400 Subject: [PATCH] --- yaml --- r: 38859 b: refs/heads/master c: 07903c02d056452da369595f00eac078bf4c7ef0 h: refs/heads/master i: 38857: 81674fdb22a3170e8270dd3e10ccb969eade3671 38855: 1633ede47474aa581dd99d62002327429b1b4702 v: v3 --- [refs] | 2 +- trunk/fs/gfs2/ops_address.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8e265e0744c8..716b68ad5530 100644 --- 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 index 25d7025e43c2..7cd53d118c89 100644 --- 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); }