summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2011-04-27 18:20:44 +0200
committerJan Kara <jack@suse.cz>2011-05-17 13:47:15 +0200
commit86c4f6d85595cd7da635dc6985d27bfa43b1ae10 (patch)
treeef129a2eebdf5cfbecc0ddfbef96b26590242c3d
parentae54870a1dc978a88377ae8af0780648f2ccd4dc (diff)
downloadlinux-stable-86c4f6d85595cd7da635dc6985d27bfa43b1ae10.tar.gz
linux-stable-86c4f6d85595cd7da635dc6985d27bfa43b1ae10.tar.bz2
linux-stable-86c4f6d85595cd7da635dc6985d27bfa43b1ae10.zip
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>
-rw-r--r--fs/ext3/namei.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index f6ce3e79d315..34b6d9bfc48a 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -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;
}