summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@gmail.com>2010-11-25 01:53:13 +0900
committerJan Kara <jack@suse.cz>2011-01-10 19:04:06 +0100
commit156e74312f1ffc0a2639c24c771c5a0e106f0505 (patch)
treea14f861cf4bd93a8aa043532aedd2164f646feab /fs
parent41dc6385bd6cd3366c1b4bede33688521eb21db9 (diff)
downloadop-kernel-dev-156e74312f1ffc0a2639c24c771c5a0e106f0505.zip
op-kernel-dev-156e74312f1ffc0a2639c24c771c5a0e106f0505.tar.gz
ext3: Add more journal error check
Check return value of ext3_journal_get_write_acccess() and ext3_journal_dirty_metadata(). Signed-off-by: Namhyung Kim <namhyung@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext3/inode.c6
-rw-r--r--fs/ext3/namei.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index a958061..ae94f6d 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -2145,13 +2145,15 @@ static void ext3_clear_blocks(handle_t *handle, struct inode *inode,
if (try_to_extend_transaction(handle, inode)) {
if (bh) {
BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
- ext3_journal_dirty_metadata(handle, bh);
+ if (ext3_journal_dirty_metadata(handle, bh))
+ return;
}
ext3_mark_inode_dirty(handle, inode);
truncate_restart_transaction(handle, inode);
if (bh) {
BUFFER_TRACE(bh, "retaking write access");
- ext3_journal_get_write_access(handle, bh);
+ if (ext3_journal_get_write_access(handle, bh))
+ return;
}
}
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index e69eed5..cc682ab 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -1598,7 +1598,9 @@ static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry,
if (err)
goto journal_error;
}
- ext3_journal_dirty_metadata(handle, frames[0].bh);
+ err = ext3_journal_dirty_metadata(handle, frames[0].bh);
+ if (err)
+ goto journal_error;
}
de = do_split(handle, dir, &bh, frame, &hinfo, &err);
if (!de)
OpenPOWER on IntegriCloud