1 files changed, 19 insertions, 16 deletions

diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index 9480a0526cd3..1663f5c3c6aa 100644
--- a/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@ -1,7 +1,7 @@
 /**
  * attrib.c - NTFS attribute operations.  Part of the Linux-NTFS project.
  *
- * Copyright (c) 2001-2005 Anton Altaparmakov
+ * Copyright (c) 2001-2006 Anton Altaparmakov
  * Copyright (c) 2002 Richard Russon
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -1048,7 +1048,7 @@ do_next_attr_loop:
                                 le32_to_cpu(ctx->mrec->bytes_allocated))
                         break;
                 if (a->type == AT_END)
-                        continue;
+                        break;
                 if (!a->length)
                         break;
                 if (al_entry->instance != a->instance)
@@ -1695,7 +1695,9 @@ int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size)
                         a->data.non_resident.initialized_size =
                         cpu_to_sle64(attr_size);
         if (NInoSparse(ni) || NInoCompressed(ni)) {
-                a->data.non_resident.compression_unit = 4;
+                a->data.non_resident.compression_unit = 0;
+                if (NInoCompressed(ni) || vol->major_ver < 3)
+                        a->data.non_resident.compression_unit = 4;
                 a->data.non_resident.compressed_size =
                                 a->data.non_resident.allocated_size;
         } else
@@ -1714,13 +1716,20 @@ int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size)
         ni->allocated_size = new_size;
         if (NInoSparse(ni) || NInoCompressed(ni)) {
                 ni->itype.compressed.size = ni->allocated_size;
-                ni->itype.compressed.block_size = 1U <<
-                                (a->data.non_resident.compression_unit +
-                                vol->cluster_size_bits);
-                ni->itype.compressed.block_size_bits =
-                                ffs(ni->itype.compressed.block_size) - 1;
-                ni->itype.compressed.block_clusters = 1U <<
-                                a->data.non_resident.compression_unit;
+                if (a->data.non_resident.compression_unit) {
+                        ni->itype.compressed.block_size = 1U << (a->data.
+                                        non_resident.compression_unit +
+                                        vol->cluster_size_bits);
+                        ni->itype.compressed.block_size_bits =
+                                        ffs(ni->itype.compressed.block_size) -
+                                        1;
+                        ni->itype.compressed.block_clusters = 1U <<
+                                        a->data.non_resident.compression_unit;
+                } else {
+                        ni->itype.compressed.block_size = 0;
+                        ni->itype.compressed.block_size_bits = 0;
+                        ni->itype.compressed.block_clusters = 0;
+                }
                 vi->i_blocks = ni->itype.compressed.size >> 9;
         } else
                 vi->i_blocks = ni->allocated_size >> 9;
@@ -2429,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(
@@ -2451,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);