diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-04-03 17:50:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 19:21:25 -0400 |
commit | dac52fc1826a788d2591a4f77e3c482b30f577e2 (patch) | |
tree | 8285a85761dd57e71497cd53482cd38031c677de /fs/befs/io.c | |
parent | 91a52ab7d664a1c8972a0ecb30955d34aea54d7f (diff) |
BEFS: logging cleanup
Summary:
- all printk(KERN_foo converted to pr_foo()
- add pr_fmt and remove redundant prefixes
- convert befs_() to va_format (based on patch by Joe Perches)
- remove non standard %Lu
- use __func__ for all debugging
[akpm@linux-foundation.org: fix printk warnings, reported by Fengguang]
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Joe Perches <joe@perches.com>
Cc: Fengguang Wu <fengguang.wu@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/befs/io.c')
-rw-r--r-- | fs/befs/io.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/fs/befs/io.c b/fs/befs/io.c index ddef98aa255d..0408a3d601d0 100644 --- a/fs/befs/io.c +++ b/fs/befs/io.c | |||
@@ -30,9 +30,9 @@ befs_bread_iaddr(struct super_block *sb, befs_inode_addr iaddr) | |||
30 | befs_blocknr_t block = 0; | 30 | befs_blocknr_t block = 0; |
31 | befs_sb_info *befs_sb = BEFS_SB(sb); | 31 | befs_sb_info *befs_sb = BEFS_SB(sb); |
32 | 32 | ||
33 | befs_debug(sb, "---> Enter befs_read_iaddr() " | 33 | befs_debug(sb, "---> Enter %s " |
34 | "[%u, %hu, %hu]", | 34 | "[%u, %hu, %hu]", __func__, iaddr.allocation_group, |
35 | iaddr.allocation_group, iaddr.start, iaddr.len); | 35 | iaddr.start, iaddr.len); |
36 | 36 | ||
37 | if (iaddr.allocation_group > befs_sb->num_ags) { | 37 | if (iaddr.allocation_group > befs_sb->num_ags) { |
38 | befs_error(sb, "BEFS: Invalid allocation group %u, max is %u", | 38 | befs_error(sb, "BEFS: Invalid allocation group %u, max is %u", |
@@ -42,20 +42,21 @@ befs_bread_iaddr(struct super_block *sb, befs_inode_addr iaddr) | |||
42 | 42 | ||
43 | block = iaddr2blockno(sb, &iaddr); | 43 | block = iaddr2blockno(sb, &iaddr); |
44 | 44 | ||
45 | befs_debug(sb, "befs_read_iaddr: offset = %lu", block); | 45 | befs_debug(sb, "%s: offset = %lu", __func__, (unsigned long)block); |
46 | 46 | ||
47 | bh = sb_bread(sb, block); | 47 | bh = sb_bread(sb, block); |
48 | 48 | ||
49 | if (bh == NULL) { | 49 | if (bh == NULL) { |
50 | befs_error(sb, "Failed to read block %lu", block); | 50 | befs_error(sb, "Failed to read block %lu", |
51 | (unsigned long)block); | ||
51 | goto error; | 52 | goto error; |
52 | } | 53 | } |
53 | 54 | ||
54 | befs_debug(sb, "<--- befs_read_iaddr()"); | 55 | befs_debug(sb, "<--- %s", __func__); |
55 | return bh; | 56 | return bh; |
56 | 57 | ||
57 | error: | 58 | error: |
58 | befs_debug(sb, "<--- befs_read_iaddr() ERROR"); | 59 | befs_debug(sb, "<--- %s ERROR", __func__); |
59 | return NULL; | 60 | return NULL; |
60 | } | 61 | } |
61 | 62 | ||
@@ -64,20 +65,21 @@ befs_bread(struct super_block *sb, befs_blocknr_t block) | |||
64 | { | 65 | { |
65 | struct buffer_head *bh = NULL; | 66 | struct buffer_head *bh = NULL; |
66 | 67 | ||
67 | befs_debug(sb, "---> Enter befs_read() %Lu", block); | 68 | befs_debug(sb, "---> Enter %s %lu", __func__, (unsigned long)block); |
68 | 69 | ||
69 | bh = sb_bread(sb, block); | 70 | bh = sb_bread(sb, block); |
70 | 71 | ||
71 | if (bh == NULL) { | 72 | if (bh == NULL) { |
72 | befs_error(sb, "Failed to read block %lu", block); | 73 | befs_error(sb, "Failed to read block %lu", |
74 | (unsigned long)block); | ||
73 | goto error; | 75 | goto error; |
74 | } | 76 | } |
75 | 77 | ||
76 | befs_debug(sb, "<--- befs_read()"); | 78 | befs_debug(sb, "<--- %s", __func__); |
77 | 79 | ||
78 | return bh; | 80 | return bh; |
79 | 81 | ||
80 | error: | 82 | error: |
81 | befs_debug(sb, "<--- befs_read() ERROR"); | 83 | befs_debug(sb, "<--- %s ERROR", __func__); |
82 | return NULL; | 84 | return NULL; |
83 | } | 85 | } |