diff options
Diffstat (limited to 'fs/ntfs/mft.c')
-rw-r--r-- | fs/ntfs/mft.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c index 2438c00ec0ce..584260fd6848 100644 --- a/fs/ntfs/mft.c +++ b/fs/ntfs/mft.c | |||
@@ -331,7 +331,7 @@ map_err_out: | |||
331 | ntfs_inode **tmp; | 331 | ntfs_inode **tmp; |
332 | int new_size = (base_ni->nr_extents + 4) * sizeof(ntfs_inode *); | 332 | int new_size = (base_ni->nr_extents + 4) * sizeof(ntfs_inode *); |
333 | 333 | ||
334 | tmp = (ntfs_inode **)kmalloc(new_size, GFP_NOFS); | 334 | tmp = kmalloc(new_size, GFP_NOFS); |
335 | if (unlikely(!tmp)) { | 335 | if (unlikely(!tmp)) { |
336 | ntfs_error(base_ni->vol->sb, "Failed to allocate " | 336 | ntfs_error(base_ni->vol->sb, "Failed to allocate " |
337 | "internal buffer."); | 337 | "internal buffer."); |
@@ -2638,11 +2638,6 @@ mft_rec_already_initialized: | |||
2638 | } | 2638 | } |
2639 | vi->i_ino = bit; | 2639 | vi->i_ino = bit; |
2640 | /* | 2640 | /* |
2641 | * This is the optimal IO size (for stat), not the fs block | ||
2642 | * size. | ||
2643 | */ | ||
2644 | vi->i_blksize = PAGE_CACHE_SIZE; | ||
2645 | /* | ||
2646 | * This is for checking whether an inode has changed w.r.t. a | 2641 | * This is for checking whether an inode has changed w.r.t. a |
2647 | * file so that the file can be updated if necessary (compare | 2642 | * file so that the file can be updated if necessary (compare |
2648 | * with f_version). | 2643 | * with f_version). |
@@ -2893,7 +2888,7 @@ rollback: | |||
2893 | if (!(base_ni->nr_extents & 3)) { | 2888 | if (!(base_ni->nr_extents & 3)) { |
2894 | int new_size = (base_ni->nr_extents + 4) * sizeof(ntfs_inode*); | 2889 | int new_size = (base_ni->nr_extents + 4) * sizeof(ntfs_inode*); |
2895 | 2890 | ||
2896 | extent_nis = (ntfs_inode**)kmalloc(new_size, GFP_NOFS); | 2891 | extent_nis = kmalloc(new_size, GFP_NOFS); |
2897 | if (unlikely(!extent_nis)) { | 2892 | if (unlikely(!extent_nis)) { |
2898 | ntfs_error(vol->sb, "Failed to allocate internal " | 2893 | ntfs_error(vol->sb, "Failed to allocate internal " |
2899 | "buffer during rollback.%s", es); | 2894 | "buffer during rollback.%s", es); |