Merge tag 'platform-drivers-x86-v6.5-4' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / fs / ntfs3 / file.c

diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index 9be3e8e..1d6c824 100644 (file)
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -179,7 +179,7 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to)
 {
        int err = 0;
        struct address_space *mapping = inode->i_mapping;
-       u32 blocksize = 1 << inode->i_blkbits;
+       u32 blocksize = i_blocksize(inode);
        pgoff_t idx = vbo >> PAGE_SHIFT;
        u32 from = vbo & (PAGE_SIZE - 1);
        pgoff_t idx_end = (vbo_to + PAGE_SIZE - 1) >> PAGE_SHIFT;
@@ -192,7 +192,7 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to)
        for (; idx < idx_end; idx += 1, from = 0) {
                page_off = (loff_t)idx << PAGE_SHIFT;
                to = (page_off + PAGE_SIZE) > vbo_to ? (vbo_to - page_off) :
-                                                            PAGE_SIZE;
+                                                      PAGE_SIZE;
                iblock = page_off >> inode->i_blkbits;
 
                page = find_or_create_page(mapping, idx,
@@ -1078,7 +1078,7 @@ static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                goto out;
 
        ret = is_compressed(ni) ? ntfs_compress_write(iocb, from) :
-                                       __generic_file_write_iter(iocb, from);
+                                 __generic_file_write_iter(iocb, from);
 
 out:
        inode_unlock(inode);