diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 07:33:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 07:33:50 -0800 |
| commit | 4850f524b2c4c8a4e9f8ef4dd9c7c4afde2f2b2c (patch) | |
| tree | deba82fa7cac39dac62d22a36ecc714d05a0f425 /fs/gfs2/lock_dlm.c | |
| parent | 3ff1562ea48cddaa5ac1adcb8892227389a4c96c (diff) | |
| parent | 4818972efb105730f007e5efc05e203a065fc318 (diff) | |
| download | linux-rt-4850f524b2c4c8a4e9f8ef4dd9c7c4afde2f2b2c.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
GFS2: print glock numbers in hex
GFS2: ordered writes are backwards
GFS2: Remove old, unused linked list code from quota
GFS2: Remove loopy umount code
GFS2: Metadata address space clean up
Diffstat (limited to 'fs/gfs2/lock_dlm.c')
| -rw-r--r-- | fs/gfs2/lock_dlm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c index 0e5e0e7022e5..569b46240f61 100644 --- a/fs/gfs2/lock_dlm.c +++ b/fs/gfs2/lock_dlm.c @@ -30,7 +30,10 @@ static void gdlm_ast(void *arg) switch (gl->gl_lksb.sb_status) { case -DLM_EUNLOCK: /* Unlocked, so glock can be freed */ - kmem_cache_free(gfs2_glock_cachep, gl); + if (gl->gl_ops->go_flags & GLOF_ASPACE) + kmem_cache_free(gfs2_glock_aspace_cachep, gl); + else + kmem_cache_free(gfs2_glock_cachep, gl); if (atomic_dec_and_test(&sdp->sd_glock_disposal)) wake_up(&sdp->sd_glock_wait); return; |