OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ext3: Fix fs corruption when make_indexed_dir() fails 

When make_indexed_dir() fails (e.g. because of ENOSPC) after it has allocated
block for index tree root, we did not properly mark all changed buffers dirty.
This lead to only some of these buffers being written out and thus effectively
corrupting the directory.

Fix the issue by marking all changed data dirty even in the error failure case.

CC: stable@kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara 2011-04-27 18:20:44 +02:00
parent ae54870a1d
commit 86c4f6d855
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/ext3/namei.c
View File

@ -1416,10 +1416,19 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry,
frame->at = entries;
frame->bh = bh;
bh = bh2;
/*
* Mark buffers dirty here so that if do_split() fails we write a
* consistent set of buffers to disk.
*/
ext3_journal_dirty_metadata(handle, frame->bh);
ext3_journal_dirty_metadata(handle, bh);
de = do_split(handle,dir, &bh, frame, &hinfo, &retval);
dx_release (frames);
if (!(de))
if (!de) {
ext3_mark_inode_dirty(handle, dir);
dx_release(frames);
return retval;
}
dx_release(frames);
return add_dirent_to_buf(handle, dentry, inode, de, bh);
}
@ -2282,7 +2291,7 @@ out_stop:
return err;
err_drop_inode:
unlock_new_inode(inode);
iput (inode);
iput(inode);
return err;
}