aboutsummaryrefslogtreecommitdiffstats
path: root/fs/hpfs/dnode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/hpfs/dnode.c')
-rw-r--r--fs/hpfs/dnode.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/hpfs/dnode.c b/fs/hpfs/dnode.c
index f36fc010fccb..2923a7bd82ac 100644
--- a/fs/hpfs/dnode.c
+++ b/fs/hpfs/dnode.c
@@ -545,12 +545,13 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno)
545 struct dnode *d1; 545 struct dnode *d1;
546 struct quad_buffer_head qbh1; 546 struct quad_buffer_head qbh1;
547 if (hpfs_sb(i->i_sb)->sb_chk) 547 if (hpfs_sb(i->i_sb)->sb_chk)
548 if (up != i->i_ino) { 548 if (up != i->i_ino) {
549 hpfs_error(i->i_sb, 549 hpfs_error(i->i_sb,
550 "bad pointer to fnode, dnode %08x, pointing to %08x, should be %08lx", 550 "bad pointer to fnode, dnode %08x, pointing to %08x, should be %08lx",
551 dno, up, (unsigned long)i->i_ino); 551 dno, up,
552 return; 552 (unsigned long)i->i_ino);
553 } 553 return;
554 }
554 if ((d1 = hpfs_map_dnode(i->i_sb, down, &qbh1))) { 555 if ((d1 = hpfs_map_dnode(i->i_sb, down, &qbh1))) {
555 d1->up = cpu_to_le32(up); 556 d1->up = cpu_to_le32(up);
556 d1->root_dnode = 1; 557 d1->root_dnode = 1;
@@ -1061,8 +1062,8 @@ struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno,
1061 hpfs_brelse4(qbh); 1062 hpfs_brelse4(qbh);
1062 if (hpfs_sb(s)->sb_chk) 1063 if (hpfs_sb(s)->sb_chk)
1063 if (hpfs_stop_cycles(s, dno, &c1, &c2, "map_fnode_dirent #1")) { 1064 if (hpfs_stop_cycles(s, dno, &c1, &c2, "map_fnode_dirent #1")) {
1064 kfree(name2); 1065 kfree(name2);
1065 return NULL; 1066 return NULL;
1066 } 1067 }
1067 goto go_down; 1068 goto go_down;
1068 } 1069 }