diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-06 17:36:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 19:08:10 -0400 |
commit | b7cb1ce2205c45bf6d356cd358b52adb55bbcf5d (patch) | |
tree | 8ce78fd4de9d804015efe5e94c56f993c50db4b3 /fs/hpfs/dir.c | |
parent | 45641c82c1e3aeaef72d693b24938da45ffb0cfc (diff) |
fs/hpfs: convert printk to pr_foo()
No level printk in hptfs_error converted to pr_err (others to pr_warn or
pr_info)
This patch also fixes if/then/else checkpatch warnings
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hpfs/dir.c')
-rw-r--r-- | fs/hpfs/dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/hpfs/dir.c b/fs/hpfs/dir.c index 292b1acb9b81..11ea93637e28 100644 --- a/fs/hpfs/dir.c +++ b/fs/hpfs/dir.c | |||
@@ -36,7 +36,7 @@ static loff_t hpfs_dir_lseek(struct file *filp, loff_t off, int whence) | |||
36 | mutex_lock(&i->i_mutex); | 36 | mutex_lock(&i->i_mutex); |
37 | hpfs_lock(s); | 37 | hpfs_lock(s); |
38 | 38 | ||
39 | /*printk("dir lseek\n");*/ | 39 | /*pr_info("dir lseek\n");*/ |
40 | if (new_off == 0 || new_off == 1 || new_off == 11 || new_off == 12 || new_off == 13) goto ok; | 40 | if (new_off == 0 || new_off == 1 || new_off == 11 || new_off == 12 || new_off == 13) goto ok; |
41 | pos = ((loff_t) hpfs_de_as_down_as_possible(s, hpfs_inode->i_dno) << 4) + 1; | 41 | pos = ((loff_t) hpfs_de_as_down_as_possible(s, hpfs_inode->i_dno) << 4) + 1; |
42 | while (pos != new_off) { | 42 | while (pos != new_off) { |
@@ -51,7 +51,7 @@ ok: | |||
51 | mutex_unlock(&i->i_mutex); | 51 | mutex_unlock(&i->i_mutex); |
52 | return new_off; | 52 | return new_off; |
53 | fail: | 53 | fail: |
54 | /*printk("illegal lseek: %016llx\n", new_off);*/ | 54 | /*pr_warn("illegal lseek: %016llx\n", new_off);*/ |
55 | hpfs_unlock(s); | 55 | hpfs_unlock(s); |
56 | mutex_unlock(&i->i_mutex); | 56 | mutex_unlock(&i->i_mutex); |
57 | return -ESPIPE; | 57 | return -ESPIPE; |
@@ -127,7 +127,7 @@ static int hpfs_readdir(struct file *file, struct dir_context *ctx) | |||
127 | if (ctx->pos == 12) | 127 | if (ctx->pos == 12) |
128 | goto out; | 128 | goto out; |
129 | if (ctx->pos == 3 || ctx->pos == 4 || ctx->pos == 5) { | 129 | if (ctx->pos == 3 || ctx->pos == 4 || ctx->pos == 5) { |
130 | printk("HPFS: warning: pos==%d\n",(int)ctx->pos); | 130 | pr_warn("HPFS: warning: pos==%d\n", (int)ctx->pos); |
131 | goto out; | 131 | goto out; |
132 | } | 132 | } |
133 | if (ctx->pos == 0) { | 133 | if (ctx->pos == 0) { |