aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ntfs/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ntfs/file.c')
-rw-r--r--fs/ntfs/file.c13
1 files changed, 1 insertions, 12 deletions
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:
1207 "attribute runlist in error code " 1207 "attribute runlist in error code "
1208 "path. Run chkdsk to recover the " 1208 "path. Run chkdsk to recover the "
1209 "lost cluster."); 1209 "lost cluster.");
1210 make_bad_inode(vi);
1211 make_bad_inode(VFS_I(base_ni));
1212 NVolSetErrors(vol); 1210 NVolSetErrors(vol);
1213 } else /* if (success) */ { 1211 } else /* if (success) */ {
1214 status.runlist_merged = 0; 1212 status.runlist_merged = 0;
@@ -1239,8 +1237,6 @@ rl_not_mapped_enoent:
1239 ntfs_error(vol->sb, "Failed to restore attribute " 1237 ntfs_error(vol->sb, "Failed to restore attribute "
1240 "record in error code path. Run " 1238 "record in error code path. Run "
1241 "chkdsk to recover."); 1239 "chkdsk to recover.");
1242 make_bad_inode(vi);
1243 make_bad_inode(VFS_I(base_ni));
1244 NVolSetErrors(vol); 1240 NVolSetErrors(vol);
1245 } else /* if (success) */ { 1241 } else /* if (success) */ {
1246 if (ntfs_mapping_pairs_build(vol, (u8*)a + 1242 if (ntfs_mapping_pairs_build(vol, (u8*)a +
@@ -1253,8 +1249,6 @@ rl_not_mapped_enoent:
1253 "mapping pairs array in error " 1249 "mapping pairs array in error "
1254 "code path. Run chkdsk to " 1250 "code path. Run chkdsk to "
1255 "recover."); 1251 "recover.");
1256 make_bad_inode(vi);
1257 make_bad_inode(VFS_I(base_ni));
1258 NVolSetErrors(vol); 1252 NVolSetErrors(vol);
1259 } 1253 }
1260 flush_dcache_mft_record_page(ctx->ntfs_ino); 1254 flush_dcache_mft_record_page(ctx->ntfs_ino);
@@ -1623,11 +1617,8 @@ err_out:
1623 unmap_mft_record(base_ni); 1617 unmap_mft_record(base_ni);
1624 ntfs_error(vi->i_sb, "Failed to update initialized_size/i_size (error " 1618 ntfs_error(vi->i_sb, "Failed to update initialized_size/i_size (error "
1625 "code %i).", err); 1619 "code %i).", err);
1626 if (err != -ENOMEM) { 1620 if (err != -ENOMEM)
1627 NVolSetErrors(ni->vol); 1621 NVolSetErrors(ni->vol);
1628 make_bad_inode(VFS_I(base_ni));
1629 make_bad_inode(vi);
1630 }
1631 return err; 1622 return err;
1632} 1623}
1633 1624
@@ -1802,8 +1793,6 @@ err_out:
1802 ntfs_error(vi->i_sb, "Resident attribute commit write failed " 1793 ntfs_error(vi->i_sb, "Resident attribute commit write failed "
1803 "with error %i.", err); 1794 "with error %i.", err);
1804 NVolSetErrors(ni->vol); 1795 NVolSetErrors(ni->vol);
1805 make_bad_inode(VFS_I(base_ni));
1806 make_bad_inode(vi);
1807 } 1796 }
1808 if (ctx) 1797 if (ctx)
1809 ntfs_attr_put_search_ctx(ctx); 1798 ntfs_attr_put_search_ctx(ctx);