|
@@ -1569,12 +1569,25 @@ static int ocfs2_rename(struct inode *old_dir,
|
|
status = ocfs2_find_entry(old_dentry->d_name.name,
|
|
status = ocfs2_find_entry(old_dentry->d_name.name,
|
|
old_dentry->d_name.len, old_dir,
|
|
old_dentry->d_name.len, old_dir,
|
|
&old_entry_lookup);
|
|
&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;
|
|
goto bail;
|
|
|
|
+ }
|
|
|
|
|
|
status = ocfs2_delete_entry(handle, old_dir, &old_entry_lookup);
|
|
status = ocfs2_delete_entry(handle, old_dir, &old_entry_lookup);
|
|
if (status < 0) {
|
|
if (status < 0) {
|
|
mlog_errno(status);
|
|
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;
|
|
goto bail;
|
|
}
|
|
}
|
|
|
|
|