Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[firefly-linux-kernel-4.4.55.git] / fs / affs / file.c

diff --git a/fs/affs/file.c b/fs/affs/file.c
index af3261b781021f0a51dda6b73b5fb5b3d051baa7..8669b6ecddee4cc030e21f39358ce2cf5058bddb 100644 (file)
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -406,7 +406,7 @@ static void affs_write_failed(struct address_space *mapping, loff_t to)
        struct inode *inode = mapping->host;
 
        if (to > inode->i_size) {
-               truncate_pagecache(inode, to, inode->i_size);
+               truncate_pagecache(inode, inode->i_size);
                affs_truncate(inode);
        }
 }
@@ -836,7 +836,7 @@ affs_truncate(struct inode *inode)
                struct address_space *mapping = inode->i_mapping;
                struct page *page;
                void *fsdata;
-               u32 size = inode->i_size;
+               loff_t size = inode->i_size;
                int res;
 
                res = mapping->a_ops->write_begin(NULL, mapping, size, 0, 0, &page, &fsdata);