diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-10 10:47:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-10 10:47:18 -0700 |
commit | f9f51cc0ce544224a8332a4c1733624fcbc70a32 (patch) | |
tree | af734f0f83edbd2ee9b8c7de2d6345ca4db42dbf | |
parent | d5f7badb5687aa14adaf1bd945b7f4605b6d8264 (diff) | |
parent | 0c7a531a200480c7bc447260376973d830da9069 (diff) | |
download | op-kernel-dev-f9f51cc0ce544224a8332a4c1733624fcbc70a32.zip op-kernel-dev-f9f51cc0ce544224a8332a4c1733624fcbc70a32.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
GFS2: Fix glock ref counting bug
-rw-r--r-- | fs/gfs2/glock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 1afd9f2..ff49810 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -1304,6 +1304,7 @@ static int gfs2_shrink_glock_memory(int nr, gfp_t gfp_mask) nr--; if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0) gfs2_glock_put(gl); + got_ref = 0; } spin_lock(&lru_lock); if (may_demote) |