diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-06 17:36:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 19:08:10 -0400 |
commit | a19189e5535ed8fd191d8989fc39da1637cfa224 (patch) | |
tree | 015539572a32a74d37a72f8ef9dd35c0d9c1a0e0 /fs/hpfs/dnode.c | |
parent | 1749a10e02a9c6ed1a5c0a2860fb9ed132f2cc42 (diff) |
fs/hpfs: increase pr_warn level
This patch applies a suggestion by Mikulas Patocka asking to increase
all pr_warn without commented ones to pr_err
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/dnode.c')
-rw-r--r-- | fs/hpfs/dnode.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/hpfs/dnode.c b/fs/hpfs/dnode.c index d10c5e91c5b2..f36fc010fccb 100644 --- a/fs/hpfs/dnode.c +++ b/fs/hpfs/dnode.c | |||
@@ -32,7 +32,7 @@ void hpfs_add_pos(struct inode *inode, loff_t *pos) | |||
32 | if (hpfs_inode->i_rddir_off[i] == pos) return; | 32 | if (hpfs_inode->i_rddir_off[i] == pos) return; |
33 | if (!(i&0x0f)) { | 33 | if (!(i&0x0f)) { |
34 | if (!(ppos = kmalloc((i+0x11) * sizeof(loff_t*), GFP_NOFS))) { | 34 | if (!(ppos = kmalloc((i+0x11) * sizeof(loff_t*), GFP_NOFS))) { |
35 | pr_warn("out of memory for position list\n"); | 35 | pr_err("out of memory for position list\n"); |
36 | return; | 36 | return; |
37 | } | 37 | } |
38 | if (hpfs_inode->i_rddir_off) { | 38 | if (hpfs_inode->i_rddir_off) { |
@@ -94,7 +94,7 @@ static void hpfs_pos_ins(loff_t *p, loff_t d, loff_t c) | |||
94 | if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) { | 94 | if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) { |
95 | int n = (*p & 0x3f) + c; | 95 | int n = (*p & 0x3f) + c; |
96 | if (n > 0x3f) | 96 | if (n > 0x3f) |
97 | pr_warn("%s(): %08x + %d\n", | 97 | pr_err("%s(): %08x + %d\n", |
98 | __func__, (int)*p, (int)c >> 8); | 98 | __func__, (int)*p, (int)c >> 8); |
99 | else | 99 | else |
100 | *p = (*p & ~0x3f) | n; | 100 | *p = (*p & ~0x3f) | n; |
@@ -106,7 +106,7 @@ static void hpfs_pos_del(loff_t *p, loff_t d, loff_t c) | |||
106 | if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) { | 106 | if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) { |
107 | int n = (*p & 0x3f) - c; | 107 | int n = (*p & 0x3f) - c; |
108 | if (n < 1) | 108 | if (n < 1) |
109 | pr_warn("%s(): %08x - %d\n", | 109 | pr_err("%s(): %08x - %d\n", |
110 | __func__, (int)*p, (int)c >> 8); | 110 | __func__, (int)*p, (int)c >> 8); |
111 | else | 111 | else |
112 | *p = (*p & ~0x3f) | n; | 112 | *p = (*p & ~0x3f) | n; |
@@ -246,7 +246,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, | |||
246 | struct fnode *fnode; | 246 | struct fnode *fnode; |
247 | int c1, c2 = 0; | 247 | int c1, c2 = 0; |
248 | if (!(nname = kmalloc(256, GFP_NOFS))) { | 248 | if (!(nname = kmalloc(256, GFP_NOFS))) { |
249 | pr_warn("out of memory, can't add to dnode\n"); | 249 | pr_err("out of memory, can't add to dnode\n"); |
250 | return 1; | 250 | return 1; |
251 | } | 251 | } |
252 | go_up: | 252 | go_up: |
@@ -288,7 +288,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, | |||
288 | not be any error while splitting dnodes, otherwise the | 288 | not be any error while splitting dnodes, otherwise the |
289 | whole directory, not only file we're adding, would | 289 | whole directory, not only file we're adding, would |
290 | be lost. */ | 290 | be lost. */ |
291 | pr_warn("out of memory for dnode splitting\n"); | 291 | pr_err("out of memory for dnode splitting\n"); |
292 | hpfs_brelse4(&qbh); | 292 | hpfs_brelse4(&qbh); |
293 | kfree(nname); | 293 | kfree(nname); |
294 | return 1; | 294 | return 1; |
@@ -604,7 +604,7 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) | |||
604 | if (!de_next->down) goto endm; | 604 | if (!de_next->down) goto endm; |
605 | ndown = de_down_pointer(de_next); | 605 | ndown = de_down_pointer(de_next); |
606 | if (!(de_cp = kmalloc(le16_to_cpu(de->length), GFP_NOFS))) { | 606 | if (!(de_cp = kmalloc(le16_to_cpu(de->length), GFP_NOFS))) { |
607 | pr_warn("out of memory for dtree balancing\n"); | 607 | pr_err("out of memory for dtree balancing\n"); |
608 | goto endm; | 608 | goto endm; |
609 | } | 609 | } |
610 | memcpy(de_cp, de, le16_to_cpu(de->length)); | 610 | memcpy(de_cp, de, le16_to_cpu(de->length)); |
@@ -645,15 +645,15 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) | |||
645 | if (!dlp && down) { | 645 | if (!dlp && down) { |
646 | if (le32_to_cpu(d1->first_free) > 2044) { | 646 | if (le32_to_cpu(d1->first_free) > 2044) { |
647 | if (hpfs_sb(i->i_sb)->sb_chk >= 2) { | 647 | if (hpfs_sb(i->i_sb)->sb_chk >= 2) { |
648 | pr_warn("unbalanced dnode tree, see hpfs.txt 4 more info\n"); | 648 | pr_err("unbalanced dnode tree, see hpfs.txt 4 more info\n"); |
649 | pr_warn("terminating balancing operation\n"); | 649 | pr_err("terminating balancing operation\n"); |
650 | } | 650 | } |
651 | hpfs_brelse4(&qbh1); | 651 | hpfs_brelse4(&qbh1); |
652 | goto endm; | 652 | goto endm; |
653 | } | 653 | } |
654 | if (hpfs_sb(i->i_sb)->sb_chk >= 2) { | 654 | if (hpfs_sb(i->i_sb)->sb_chk >= 2) { |
655 | pr_warn("unbalanced dnode tree, see hpfs.txt 4 more info\n"); | 655 | pr_err("unbalanced dnode tree, see hpfs.txt 4 more info\n"); |
656 | pr_warn("goin'on\n"); | 656 | pr_err("goin'on\n"); |
657 | } | 657 | } |
658 | le16_add_cpu(&del->length, 4); | 658 | le16_add_cpu(&del->length, 4); |
659 | del->down = 1; | 659 | del->down = 1; |
@@ -667,7 +667,7 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) | |||
667 | *(__le32 *) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down); | 667 | *(__le32 *) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down); |
668 | } else goto endm; | 668 | } else goto endm; |
669 | if (!(de_cp = kmalloc(le16_to_cpu(de_prev->length), GFP_NOFS))) { | 669 | if (!(de_cp = kmalloc(le16_to_cpu(de_prev->length), GFP_NOFS))) { |
670 | pr_warn("out of memory for dtree balancing\n"); | 670 | pr_err("out of memory for dtree balancing\n"); |
671 | hpfs_brelse4(&qbh1); | 671 | hpfs_brelse4(&qbh1); |
672 | goto endm; | 672 | goto endm; |
673 | } | 673 | } |
@@ -1008,7 +1008,7 @@ struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno, | |||
1008 | int d1, d2 = 0; | 1008 | int d1, d2 = 0; |
1009 | name1 = f->name; | 1009 | name1 = f->name; |
1010 | if (!(name2 = kmalloc(256, GFP_NOFS))) { | 1010 | if (!(name2 = kmalloc(256, GFP_NOFS))) { |
1011 | pr_warn("out of memory, can't map dirent\n"); | 1011 | pr_err("out of memory, can't map dirent\n"); |
1012 | return NULL; | 1012 | return NULL; |
1013 | } | 1013 | } |
1014 | if (f->len <= 15) | 1014 | if (f->len <= 15) |