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

ocfs2: set filesytem read-only when ocfs2_delete_entry failed. 

In ocfs2_rename, it will lead to an inode with two entried(old and new) if
ocfs2_delete_entry(old) failed.  Thus, filesystem will be inconsistent.

The case is described below:

ocfs2_rename
    -> ocfs2_start_trans
    -> ocfs2_add_entry(new)
    -> ocfs2_delete_entry(old)
        -> __ocfs2_journal_access *failed* because of -ENOMEM
    -> ocfs2_commit_trans

So filesystem should be set to read-only at the moment.

Signed-off-by: Yiwen Jiang <jiangyiwen@huawei.com>
Cc: Joseph Qi <joseph.qi@huawei.com>
Cc: Joel Becker <jlbec@evilplan.org>
Reviewed-by: Mark Fasheh <mfasheh@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
jiangyiwen 2015-09-04 15:44:06 -07:00 committed by Linus Torvalds
parent f83c7b5e9f
commit 807a790711
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/ocfs2/namei.c
View File

@ -1569,12 +1569,25 @@ static int ocfs2_rename(struct inode *old_dir,
status = ocfs2_find_entry(old_dentry->d_name.name,
old_dentry->d_name.len, old_dir,
&old_entry_lookup);
if (status)
if (status) {
if (!is_journal_aborted(osb->journal->j_journal)) {
ocfs2_error(osb->sb, "new entry %.*s is added, but old entry %.*s "
"is not deleted.",
new_dentry->d_name.len, new_dentry->d_name.name,
old_dentry->d_name.len, old_dentry->d_name.name);
}
goto bail;
}
status = ocfs2_delete_entry(handle, old_dir, &old_entry_lookup);
if (status < 0) {
mlog_errno(status);
if (!is_journal_aborted(osb->journal->j_journal)) {
ocfs2_error(osb->sb, "new entry %.*s is added, but old entry %.*s "
"is not deleted.",
new_dentry->d_name.len, new_dentry->d_name.name,
old_dentry->d_name.len, old_dentry->d_name.name);
}
goto bail;
}