6 files changed, 5 insertions, 23 deletions

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index b5774233ef1d..13e70d4e2fdb 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -32,6 +32,8 @@ ToDo/Notes:
           unused, invalid mft records which are the same in both $MFT and
           $MFTMirr.
         - Add support for sparse files which have a compression unit of 0.
+        - Remove all the make_bad_inode() calls.  This should only be called
+          from read inode and new inode code paths.
 
 2.1.26 - Minor bug fixes and updates.
 
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index 7c7e313620fa..1cf105b99202 100644
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -1530,7 +1530,6 @@ err_out:
                                 "error %i.", err);
                 SetPageError(page);
                 NVolSetErrors(ni->vol);
-                make_bad_inode(vi);
         }
         unlock_page(page);
         if (ctx)
diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index 7a568eb7d80f..1663f5c3c6aa 100644
--- a/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@ -2438,16 +2438,12 @@ undo_alloc:
                                 "chkdsk to recover.", IS_ERR(m) ?
                                 "restore attribute search context" :
                                 "truncate attribute runlist");
-                make_bad_inode(vi);
-                make_bad_inode(VFS_I(base_ni));
                 NVolSetErrors(vol);
         } else if (mp_rebuilt) {
                 if (ntfs_attr_record_resize(m, a, attr_len)) {
                         ntfs_error(vol->sb, "Failed to restore attribute "
                                         "record in error code path.  Run "
                                         "chkdsk to recover.");
-                        make_bad_inode(vi);
-                        make_bad_inode(VFS_I(base_ni));
                         NVolSetErrors(vol);
                 } else /* if (success) */ {
                         if (ntfs_mapping_pairs_build(vol, (u8*)a + le16_to_cpu(
@@ -2460,8 +2456,6 @@ undo_alloc:
                                                 "mapping pairs array in error "
                                                 "code path.  Run chkdsk to "
                                                 "recover.");
-                                make_bad_inode(vi);
-                                make_bad_inode(VFS_I(base_ni));
                                 NVolSetErrors(vol);
                         }
                         flush_dcache_mft_record_page(ctx->ntfs_ino);
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 2e5ba0c535d9..f5d057e4acc2 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -1207,8 +1207,6 @@ rl_not_mapped_enoent:
                                         "attribute runlist in error code "
                                         "path.  Run chkdsk to recover the "
                                         "lost cluster.");
-                        make_bad_inode(vi);
-                        make_bad_inode(VFS_I(base_ni));
                         NVolSetErrors(vol);
                 } else /* if (success) */ {
                         status.runlist_merged = 0;
@@ -1239,8 +1237,6 @@ rl_not_mapped_enoent:
                         ntfs_error(vol->sb, "Failed to restore attribute "
                                         "record in error code path.  Run "
                                         "chkdsk to recover.");
-                        make_bad_inode(vi);
-                        make_bad_inode(VFS_I(base_ni));
                         NVolSetErrors(vol);
                 } else /* if (success) */ {
                         if (ntfs_mapping_pairs_build(vol, (u8*)a +
@@ -1253,8 +1249,6 @@ rl_not_mapped_enoent:
                                                 "mapping pairs array in error "
                                                 "code path.  Run chkdsk to "
                                                 "recover.");
-                                make_bad_inode(vi);
-                                make_bad_inode(VFS_I(base_ni));
                                 NVolSetErrors(vol);
                         }
                         flush_dcache_mft_record_page(ctx->ntfs_ino);
@@ -1623,11 +1617,8 @@ err_out:
                 unmap_mft_record(base_ni);
         ntfs_error(vi->i_sb, "Failed to update initialized_size/i_size (error "
                         "code %i).", err);
-        if (err != -ENOMEM) {
+        if (err != -ENOMEM)
                 NVolSetErrors(ni->vol);
-                make_bad_inode(VFS_I(base_ni));
-                make_bad_inode(vi);
-        }
         return err;
 }
 
@@ -1802,8 +1793,6 @@ err_out:
                 ntfs_error(vi->i_sb, "Resident attribute commit write failed "
                                 "with error %i.", err);
                 NVolSetErrors(ni->vol);
-                make_bad_inode(VFS_I(base_ni));
-                make_bad_inode(vi);
         }
         if (ctx)
                 ntfs_attr_put_search_ctx(ctx);
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index 6499aafc2258..7254391b0e50 100644
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -93,6 +93,7 @@ static inline MFT_RECORD *map_mft_record_page(ntfs_inode *ni)
                                 "Run chkdsk.", ni->mft_no);
                 ntfs_unmap_page(page);
                 page = ERR_PTR(-EIO);
+                NVolSetErrors(vol);
         }
 err_out:
         ni->page = NULL;
diff --git a/fs/ntfs/mft.h b/fs/ntfs/mft.h
index 407de2cef1d6..639cd1bab08b 100644
--- a/fs/ntfs/mft.h
+++ b/fs/ntfs/mft.h
@@ -97,10 +97,7 @@ extern int write_mft_record_nolock(ntfs_inode *ni, MFT_RECORD *m, int sync);
  * uptodate.
  *
  * On success, clean the mft record and return 0.  On error, leave the mft
- * record dirty and return -errno.  The caller should call make_bad_inode() on
- * the base inode to ensure no more access happens to this inode.  We do not do
- * it here as the caller may want to finish writing other extent mft records
- * first to minimize on-disk metadata inconsistencies.
+ * record dirty and return -errno.
  */
 static inline int write_mft_record(ntfs_inode *ni, MFT_RECORD *m, int sync)
 {