diff options
author | Russell Cattelan <cattelan@redhat.com> | 2006-08-10 12:08:40 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-10 17:18:59 -0400 |
commit | 8872187780f6104216c67e7b60c11f708b513c38 (patch) | |
tree | 690823763a87d7cd4c90e94760319414e2fc4ad6 /fs/gfs2/glock.c | |
parent | 4a99c3d9d6663085e28bc7ac8dae1e985c5a6174 (diff) |
[GFS2] Fix a couple of refcount leaks.
recovery.c add a brelse to deal with gfs2_replay_read_block being called
twice on the same block.
add a dput to drop the ref count on the root inode.
This was causing lingering glocks and thus causing
a mount failure to hang.
Fix a endian conversion macro that was was swizzling
16bits when it should have been swizzling 32.
Signed-off-by: Russell Cattelan <cattelan@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/glock.c')
-rw-r--r-- | fs/gfs2/glock.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index b6edf7c0923b..a5e16e539999 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
@@ -2167,7 +2167,9 @@ static int dump_glock(struct gfs2_glock *gl) | |||
2167 | 2167 | ||
2168 | spin_lock(&gl->gl_spin); | 2168 | spin_lock(&gl->gl_spin); |
2169 | 2169 | ||
2170 | printk(KERN_INFO "Glock (%u, %llu)\n", gl->gl_name.ln_type, | 2170 | printk(KERN_INFO "Glock 0x%p (%u, %llu)\n", |
2171 | gl, | ||
2172 | gl->gl_name.ln_type, | ||
2171 | (unsigned long long)gl->gl_name.ln_number); | 2173 | (unsigned long long)gl->gl_name.ln_number); |
2172 | printk(KERN_INFO " gl_flags ="); | 2174 | printk(KERN_INFO " gl_flags ="); |
2173 | for (x = 0; x < 32; x++) | 2175 | for (x = 0; x < 32; x++) |
@@ -2187,8 +2189,9 @@ static int dump_glock(struct gfs2_glock *gl) | |||
2187 | printk(KERN_INFO " reclaim = %s\n", | 2189 | printk(KERN_INFO " reclaim = %s\n", |
2188 | (list_empty(&gl->gl_reclaim)) ? "no" : "yes"); | 2190 | (list_empty(&gl->gl_reclaim)) ? "no" : "yes"); |
2189 | if (gl->gl_aspace) | 2191 | if (gl->gl_aspace) |
2190 | printk(KERN_INFO " aspace = %lu\n", | 2192 | printk(KERN_INFO " aspace = 0x%p nrpages = %lu\n", |
2191 | gl->gl_aspace->i_mapping->nrpages); | 2193 | gl->gl_aspace, |
2194 | gl->gl_aspace->i_mapping->nrpages); | ||
2192 | else | 2195 | else |
2193 | printk(KERN_INFO " aspace = no\n"); | 2196 | printk(KERN_INFO " aspace = no\n"); |
2194 | printk(KERN_INFO " ail = %d\n", atomic_read(&gl->gl_ail_count)); | 2197 | printk(KERN_INFO " ail = %d\n", atomic_read(&gl->gl_ail_count)); |