diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-10 13:47:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-10 13:47:18 -0400 |
| commit | f9f51cc0ce544224a8332a4c1733624fcbc70a32 (patch) | |
| tree | af734f0f83edbd2ee9b8c7de2d6345ca4db42dbf | |
| parent | d5f7badb5687aa14adaf1bd945b7f4605b6d8264 (diff) | |
| parent | 0c7a531a200480c7bc447260376973d830da9069 (diff) | |
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 1afd9f26bcb1..ff4981090489 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) | |||
| 1304 | nr--; | 1304 | nr--; |
| 1305 | if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0) | 1305 | if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0) |
| 1306 | gfs2_glock_put(gl); | 1306 | gfs2_glock_put(gl); |
| 1307 | got_ref = 0; | ||
| 1307 | } | 1308 | } |
| 1308 | spin_lock(&lru_lock); | 1309 | spin_lock(&lru_lock); |
| 1309 | if (may_demote) | 1310 | if (may_demote) |