diff options
Diffstat (limited to 'fs/gfs2/glock.c')
-rw-r--r-- | fs/gfs2/glock.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index d4fa395ed39f..f30fde91d14a 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
@@ -2315,17 +2315,17 @@ static int dump_holder(char *str, struct gfs2_holder *gh) | |||
2315 | unsigned int x; | 2315 | unsigned int x; |
2316 | int error = -ENOBUFS; | 2316 | int error = -ENOBUFS; |
2317 | 2317 | ||
2318 | printk(" %s\n", str); | 2318 | printk(KERN_INFO " %s\n", str); |
2319 | printk(" owner = %ld\n", | 2319 | printk(KERN_INFO " owner = %ld\n", |
2320 | (gh->gh_owner) ? (long)gh->gh_owner->pid : -1); | 2320 | (gh->gh_owner) ? (long)gh->gh_owner->pid : -1); |
2321 | printk(" gh_state = %u\n", gh->gh_state); | 2321 | printk(KERN_INFO " gh_state = %u\n", gh->gh_state); |
2322 | printk(" gh_flags ="); | 2322 | printk(KERN_INFO " gh_flags ="); |
2323 | for (x = 0; x < 32; x++) | 2323 | for (x = 0; x < 32; x++) |
2324 | if (gh->gh_flags & (1 << x)) | 2324 | if (gh->gh_flags & (1 << x)) |
2325 | printk(" %u", x); | 2325 | printk(" %u", x); |
2326 | printk(" \n"); | 2326 | printk(" \n"); |
2327 | printk(" error = %d\n", gh->gh_error); | 2327 | printk(KERN_INFO " error = %d\n", gh->gh_error); |
2328 | printk(" gh_iflags ="); | 2328 | printk(KERN_INFO " gh_iflags ="); |
2329 | for (x = 0; x < 32; x++) | 2329 | for (x = 0; x < 32; x++) |
2330 | if (test_bit(x, &gh->gh_iflags)) | 2330 | if (test_bit(x, &gh->gh_iflags)) |
2331 | printk(" %u", x); | 2331 | printk(" %u", x); |
@@ -2348,17 +2348,17 @@ static int dump_inode(struct gfs2_inode *ip) | |||
2348 | unsigned int x; | 2348 | unsigned int x; |
2349 | int error = -ENOBUFS; | 2349 | int error = -ENOBUFS; |
2350 | 2350 | ||
2351 | printk(" Inode:\n"); | 2351 | printk(KERN_INFO " Inode:\n"); |
2352 | printk(" num = %llu %llu\n", | 2352 | printk(KERN_INFO " num = %llu %llu\n", |
2353 | ip->i_num.no_formal_ino, ip->i_num.no_addr); | 2353 | ip->i_num.no_formal_ino, ip->i_num.no_addr); |
2354 | printk(" type = %u\n", IF2DT(ip->i_di.di_mode)); | 2354 | printk(KERN_INFO " type = %u\n", IF2DT(ip->i_di.di_mode)); |
2355 | printk(" i_count = %d\n", atomic_read(&ip->i_count)); | 2355 | printk(KERN_INFO " i_count = %d\n", atomic_read(&ip->i_count)); |
2356 | printk(" i_flags ="); | 2356 | printk(KERN_INFO " i_flags ="); |
2357 | for (x = 0; x < 32; x++) | 2357 | for (x = 0; x < 32; x++) |
2358 | if (test_bit(x, &ip->i_flags)) | 2358 | if (test_bit(x, &ip->i_flags)) |
2359 | printk(" %u", x); | 2359 | printk(" %u", x); |
2360 | printk(" \n"); | 2360 | printk(" \n"); |
2361 | printk(" vnode = %s\n", (ip->i_vnode) ? "yes" : "no"); | 2361 | printk(KERN_INFO " vnode = %s\n", (ip->i_vnode) ? "yes" : "no"); |
2362 | 2362 | ||
2363 | error = 0; | 2363 | error = 0; |
2364 | 2364 | ||
@@ -2381,30 +2381,30 @@ static int dump_glock(struct gfs2_glock *gl) | |||
2381 | 2381 | ||
2382 | spin_lock(&gl->gl_spin); | 2382 | spin_lock(&gl->gl_spin); |
2383 | 2383 | ||
2384 | printk("Glock (%u, %llu)\n", | 2384 | printk(KERN_INFO "Glock (%u, %llu)\n", |
2385 | gl->gl_name.ln_type, | 2385 | gl->gl_name.ln_type, |
2386 | gl->gl_name.ln_number); | 2386 | gl->gl_name.ln_number); |
2387 | printk(" gl_flags ="); | 2387 | printk(KERN_INFO " gl_flags ="); |
2388 | for (x = 0; x < 32; x++) | 2388 | for (x = 0; x < 32; x++) |
2389 | if (test_bit(x, &gl->gl_flags)) | 2389 | if (test_bit(x, &gl->gl_flags)) |
2390 | printk(" %u", x); | 2390 | printk(" %u", x); |
2391 | printk(" \n"); | 2391 | printk(" \n"); |
2392 | printk(" gl_ref = %d\n", atomic_read(&gl->gl_ref.refcount)); | 2392 | printk(KERN_INFO " gl_ref = %d\n", atomic_read(&gl->gl_ref.refcount)); |
2393 | printk(" gl_state = %u\n", gl->gl_state); | 2393 | printk(KERN_INFO " gl_state = %u\n", gl->gl_state); |
2394 | printk(" req_gh = %s\n", (gl->gl_req_gh) ? "yes" : "no"); | 2394 | printk(KERN_INFO " req_gh = %s\n", (gl->gl_req_gh) ? "yes" : "no"); |
2395 | printk(" req_bh = %s\n", (gl->gl_req_bh) ? "yes" : "no"); | 2395 | printk(KERN_INFO " req_bh = %s\n", (gl->gl_req_bh) ? "yes" : "no"); |
2396 | printk(" lvb_count = %d\n", atomic_read(&gl->gl_lvb_count)); | 2396 | printk(KERN_INFO " lvb_count = %d\n", atomic_read(&gl->gl_lvb_count)); |
2397 | printk(" object = %s\n", (gl->gl_object) ? "yes" : "no"); | 2397 | printk(KERN_INFO " object = %s\n", (gl->gl_object) ? "yes" : "no"); |
2398 | printk(" le = %s\n", | 2398 | printk(KERN_INFO " le = %s\n", |
2399 | (list_empty(&gl->gl_le.le_list)) ? "no" : "yes"); | 2399 | (list_empty(&gl->gl_le.le_list)) ? "no" : "yes"); |
2400 | printk(" reclaim = %s\n", | 2400 | printk(KERN_INFO " reclaim = %s\n", |
2401 | (list_empty(&gl->gl_reclaim)) ? "no" : "yes"); | 2401 | (list_empty(&gl->gl_reclaim)) ? "no" : "yes"); |
2402 | if (gl->gl_aspace) | 2402 | if (gl->gl_aspace) |
2403 | printk(" aspace = %lu\n", | 2403 | printk(KERN_INFO " aspace = %lu\n", |
2404 | gl->gl_aspace->i_mapping->nrpages); | 2404 | gl->gl_aspace->i_mapping->nrpages); |
2405 | else | 2405 | else |
2406 | printk(" aspace = no\n"); | 2406 | printk(KERN_INFO " aspace = no\n"); |
2407 | printk(" ail = %d\n", atomic_read(&gl->gl_ail_count)); | 2407 | printk(KERN_INFO " ail = %d\n", atomic_read(&gl->gl_ail_count)); |
2408 | if (gl->gl_req_gh) { | 2408 | if (gl->gl_req_gh) { |
2409 | error = dump_holder("Request", gl->gl_req_gh); | 2409 | error = dump_holder("Request", gl->gl_req_gh); |
2410 | if (error) | 2410 | if (error) |
@@ -2438,7 +2438,7 @@ static int dump_glock(struct gfs2_glock *gl) | |||
2438 | goto out; | 2438 | goto out; |
2439 | } else { | 2439 | } else { |
2440 | error = -ENOBUFS; | 2440 | error = -ENOBUFS; |
2441 | printk(" Inode: busy\n"); | 2441 | printk(KERN_INFO " Inode: busy\n"); |
2442 | } | 2442 | } |
2443 | } | 2443 | } |
2444 | 2444 | ||