JFS: Fix i_blocks accounting when allocation fails
A failure in dbAlloc caused a directory's i_blocks to be incorrectly incremented, causing jfs_fsck to find the inode to be corrupt. Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
This commit is contained in:
parent
c2783f3a62
commit
18190cc08d
1 changed files with 9 additions and 4 deletions
|
@ -381,9 +381,12 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
|
|||
* It's time to move the inline table to an external
|
||||
* page and begin to build the xtree
|
||||
*/
|
||||
if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage) ||
|
||||
dbAlloc(ip, 0, sbi->nbperpage, &xaddr))
|
||||
goto clean_up; /* No space */
|
||||
if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage))
|
||||
goto clean_up;
|
||||
if (dbAlloc(ip, 0, sbi->nbperpage, &xaddr)) {
|
||||
DQUOT_FREE_BLOCK(ip, sbi->nbperpage);
|
||||
goto clean_up;
|
||||
}
|
||||
|
||||
/*
|
||||
* Save the table, we're going to overwrite it with the
|
||||
|
@ -397,13 +400,15 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
|
|||
xtInitRoot(tid, ip);
|
||||
|
||||
/*
|
||||
* Allocate the first block & add it to the xtree
|
||||
* Add the first block to the xtree
|
||||
*/
|
||||
if (xtInsert(tid, ip, 0, 0, sbi->nbperpage, &xaddr, 0)) {
|
||||
/* This really shouldn't fail */
|
||||
jfs_warn("add_index: xtInsert failed!");
|
||||
memcpy(&jfs_ip->i_dirtable, temp_table,
|
||||
sizeof (temp_table));
|
||||
dbFree(ip, xaddr, sbi->nbperpage);
|
||||
DQUOT_FREE_BLOCK(ip, sbi->nbperpage);
|
||||
goto clean_up;
|
||||
}
|
||||
ip->i_size = PSIZE;
|
||||
|
|
Loading…
Reference in a new issue