diff options
Diffstat (limited to 'fs/gfs2/glock.c')
-rw-r--r-- | fs/gfs2/glock.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index f98694e7d668..78fe0fae23ff 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
@@ -371,7 +371,7 @@ fail_aspace: | |||
371 | if (gl->gl_aspace) | 371 | if (gl->gl_aspace) |
372 | gfs2_aspace_put(gl->gl_aspace); | 372 | gfs2_aspace_put(gl->gl_aspace); |
373 | fail: | 373 | fail: |
374 | kmem_cache_free(gfs2_glock_cachep, gl); | 374 | kmem_cache_free(gfs2_glock_cachep, gl); |
375 | return error; | 375 | return error; |
376 | } | 376 | } |
377 | 377 | ||
@@ -614,7 +614,7 @@ static int rq_greedy(struct gfs2_holder *gh) | |||
614 | gfs2_holder_uninit(gh); | 614 | gfs2_holder_uninit(gh); |
615 | kfree(container_of(gh, struct greedy, gr_gh)); | 615 | kfree(container_of(gh, struct greedy, gr_gh)); |
616 | 616 | ||
617 | spin_lock(&gl->gl_spin); | 617 | spin_lock(&gl->gl_spin); |
618 | 618 | ||
619 | return 0; | 619 | return 0; |
620 | } | 620 | } |
@@ -1184,11 +1184,11 @@ static void add_to_queue(struct gfs2_holder *gh) | |||
1184 | if (existing) { | 1184 | if (existing) { |
1185 | print_symbol(KERN_WARNING "original: %s\n", existing->gh_ip); | 1185 | print_symbol(KERN_WARNING "original: %s\n", existing->gh_ip); |
1186 | printk(KERN_INFO "pid : %d\n", existing->gh_owner->pid); | 1186 | printk(KERN_INFO "pid : %d\n", existing->gh_owner->pid); |
1187 | printk(KERN_INFO "lock type : %d lock state : %d\n", | 1187 | printk(KERN_INFO "lock type : %d lock state : %d\n", |
1188 | existing->gh_gl->gl_name.ln_type, existing->gh_gl->gl_state); | 1188 | existing->gh_gl->gl_name.ln_type, existing->gh_gl->gl_state); |
1189 | print_symbol(KERN_WARNING "new: %s\n", gh->gh_ip); | 1189 | print_symbol(KERN_WARNING "new: %s\n", gh->gh_ip); |
1190 | printk(KERN_INFO "pid : %d\n", gh->gh_owner->pid); | 1190 | printk(KERN_INFO "pid : %d\n", gh->gh_owner->pid); |
1191 | printk(KERN_INFO "lock type : %d lock state : %d\n", | 1191 | printk(KERN_INFO "lock type : %d lock state : %d\n", |
1192 | gl->gl_name.ln_type, gl->gl_state); | 1192 | gl->gl_name.ln_type, gl->gl_state); |
1193 | BUG(); | 1193 | BUG(); |
1194 | } | 1194 | } |
@@ -1203,7 +1203,7 @@ static void add_to_queue(struct gfs2_holder *gh) | |||
1203 | if (gh->gh_flags & LM_FLAG_PRIORITY) | 1203 | if (gh->gh_flags & LM_FLAG_PRIORITY) |
1204 | list_add(&gh->gh_list, &gl->gl_waiters3); | 1204 | list_add(&gh->gh_list, &gl->gl_waiters3); |
1205 | else | 1205 | else |
1206 | list_add_tail(&gh->gh_list, &gl->gl_waiters3); | 1206 | list_add_tail(&gh->gh_list, &gl->gl_waiters3); |
1207 | } | 1207 | } |
1208 | 1208 | ||
1209 | /** | 1209 | /** |
@@ -2003,7 +2003,7 @@ void gfs2_gl_hash_clear(struct gfs2_sbd *sdp, int wait) | |||
2003 | for (;;) { | 2003 | for (;;) { |
2004 | cont = 0; | 2004 | cont = 0; |
2005 | for (x = 0; x < GFS2_GL_HASH_SIZE; x++) { | 2005 | for (x = 0; x < GFS2_GL_HASH_SIZE; x++) { |
2006 | if (examine_bucket(clear_glock, sdp, x)) | 2006 | if (examine_bucket(clear_glock, sdp, x)) |
2007 | cont = 1; | 2007 | cont = 1; |
2008 | } | 2008 | } |
2009 | 2009 | ||