Merge tag 'nfs-for-3.12-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[platform/adaptation/renesas_rcar/renesas_kernel.git] / fs / xfs / xfs_aops.c

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 977da0e..e51e581 100644 (file)
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -1582,7 +1582,7 @@ xfs_vm_write_begin(
                unlock_page(page);
 
                if (pos + len > i_size_read(inode))
                unlock_page(page);
 
                if (pos + len > i_size_read(inode))

-                       truncate_pagecache(inode, pos + len, i_size_read(inode));
+                       truncate_pagecache(inode, i_size_read(inode));

 
                page_cache_release(page);
                page = NULL;
 
                page_cache_release(page);
                page = NULL;


@@ -1618,7 +1618,7 @@ xfs_vm_write_end(
                loff_t          to = pos + len;
 
                if (to > isize) {
                loff_t          to = pos + len;
 
                if (to > isize) {

-                       truncate_pagecache(inode, to, isize);
+                       truncate_pagecache(inode, isize);

                        xfs_vm_kill_delalloc_range(inode, isize, to);
                }
        }
                        xfs_vm_kill_delalloc_range(inode, isize, to);
                }
        }