diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
--- a/fs/ntfs3/frecord.c
+++ b/fs/ntfs3/frecord.c
@@ -3029,11 +3029,11 @@ int ni_rename(...)
 if (err && ni_remove_name(new_dir_ni, ni, new_de, &de2, &undo)) {
     ntfs_err(sb, "ni_rename: failed to clean up after add_name failure");
     *is_bad = true;
-    WARN_ON(err);
+    ntfs_warn(sb, "ni_rename: incomplete rename cleanup, marking bad");
 }
 
 /*