diff options
Diffstat (limited to 'fs/hpfs/dnode.c')
| -rw-r--r-- | fs/hpfs/dnode.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/fs/hpfs/dnode.c b/fs/hpfs/dnode.c index ff4f898ab952..69554e208b26 100644 --- a/fs/hpfs/dnode.c +++ b/fs/hpfs/dnode.c @@ -17,7 +17,7 @@ static loff_t get_pos(struct dnode *d, struct hpfs_dirent *fde) if (de == fde) return ((loff_t) le32_to_cpu(d->self) << 4) | (loff_t)i; i++; } - pr_info("HPFS: get_pos: not_found\n"); + pr_info("get_pos: not_found\n"); return ((loff_t)le32_to_cpu(d->self) << 4) | (loff_t)1; } @@ -32,7 +32,7 @@ void hpfs_add_pos(struct inode *inode, loff_t *pos) if (hpfs_inode->i_rddir_off[i] == pos) return; if (!(i&0x0f)) { if (!(ppos = kmalloc((i+0x11) * sizeof(loff_t*), GFP_NOFS))) { - pr_warn("HPFS: out of memory for position list\n"); + pr_warn("out of memory for position list\n"); return; } if (hpfs_inode->i_rddir_off) { @@ -63,7 +63,7 @@ void hpfs_del_pos(struct inode *inode, loff_t *pos) } return; not_f: - /*pr_info("HPFS: warning: position pointer %p->%08x not found\n", + /*pr_warn("position pointer %p->%08x not found\n", pos, (int)*pos);*/ return; } @@ -94,7 +94,7 @@ static void hpfs_pos_ins(loff_t *p, loff_t d, loff_t c) if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) { int n = (*p & 0x3f) + c; if (n > 0x3f) - pr_warn("HPFS: hpfs_pos_ins: %08x + %d\n", + pr_warn("hpfs_pos_ins: %08x + %d\n", (int)*p, (int)c >> 8); else *p = (*p & ~0x3f) | n; @@ -106,7 +106,7 @@ static void hpfs_pos_del(loff_t *p, loff_t d, loff_t c) if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) { int n = (*p & 0x3f) - c; if (n < 1) - pr_warn("HPFS: hpfs_pos_ins: %08x - %d\n", + pr_warn("hpfs_pos_ins: %08x - %d\n", (int)*p, (int)c >> 8); else *p = (*p & ~0x3f) | n; @@ -246,7 +246,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, struct fnode *fnode; int c1, c2 = 0; if (!(nname = kmalloc(256, GFP_NOFS))) { - pr_warn("HPFS: out of memory, can't add to dnode\n"); + pr_warn("out of memory, can't add to dnode\n"); return 1; } go_up: @@ -288,7 +288,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, not be any error while splitting dnodes, otherwise the whole directory, not only file we're adding, would be lost. */ - pr_warn("HPFS: out of memory for dnode splitting\n"); + pr_warn("out of memory for dnode splitting\n"); hpfs_brelse4(&qbh); kfree(nname); return 1; @@ -604,7 +604,7 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) if (!de_next->down) goto endm; ndown = de_down_pointer(de_next); if (!(de_cp = kmalloc(le16_to_cpu(de->length), GFP_NOFS))) { - pr_warn("HPFS: out of memory for dtree balancing\n"); + pr_warn("out of memory for dtree balancing\n"); goto endm; } memcpy(de_cp, de, le16_to_cpu(de->length)); @@ -645,15 +645,15 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) if (!dlp && down) { if (le32_to_cpu(d1->first_free) > 2044) { if (hpfs_sb(i->i_sb)->sb_chk >= 2) { - pr_warn("HPFS: warning: unbalanced dnode tree, see hpfs.txt 4 more info\n"); - pr_warn("HPFS: warning: terminating balancing operation\n"); + pr_warn("unbalanced dnode tree, see hpfs.txt 4 more info\n"); + pr_warn("terminating balancing operation\n"); } hpfs_brelse4(&qbh1); goto endm; } if (hpfs_sb(i->i_sb)->sb_chk >= 2) { - pr_warn("HPFS: warning: unbalanced dnode tree, see hpfs.txt 4 more info\n"); - pr_warn("HPFS: warning: goin'on\n"); + pr_warn("unbalanced dnode tree, see hpfs.txt 4 more info\n"); + pr_warn("goin'on\n"); } le16_add_cpu(&del->length, 4); del->down = 1; @@ -667,7 +667,7 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) *(__le32 *) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down); } else goto endm; if (!(de_cp = kmalloc(le16_to_cpu(de_prev->length), GFP_NOFS))) { - pr_warn("HPFS: out of memory for dtree balancing\n"); + pr_warn("out of memory for dtree balancing\n"); hpfs_brelse4(&qbh1); goto endm; } @@ -1008,7 +1008,7 @@ struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno, int d1, d2 = 0; name1 = f->name; if (!(name2 = kmalloc(256, GFP_NOFS))) { - pr_warn("HPFS: out of memory, can't map dirent\n"); + pr_warn("out of memory, can't map dirent\n"); return NULL; } if (f->len <= 15) |