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>

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 97c47d71efa721d9e1f669634538600c726ddc46..1c43993e81b05fd0bf2aca42c0ddf4d222587368 100644 (file)
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -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;
        }