truncate: drop 'oldsize' truncate_pagecache() parameter

truncate_pagecache() doesn't care about old size since commit
cedabed49b39 ("vfs: Fix vmtruncate() regression").  Let's drop it.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

28 files changed, 31 insertions, 44 deletions

diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c
index 5f95d1ed9c6d..b9acadafa4a1 100644
--- a/fs/adfs/inode.c
+++ b/fs/adfs/inode.c
@@ -50,7 +50,7 @@ static void adfs_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);
 }
 
 static int adfs_write_begin(struct file *file, struct address_space *mapping,
diff --git a/fs/affs/file.c b/fs/affs/file.c
index 776e3935a758..8669b6ecddee 100644
--- 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);
         }
 }
diff --git a/fs/bfs/file.c b/fs/bfs/file.c
index ad3ea1497cc3..ae2892218335 100644
--- a/fs/bfs/file.c
+++ b/fs/bfs/file.c
@@ -166,7 +166,7 @@ static void bfs_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);
 }
 
 static int bfs_write_begin(struct file *file, struct address_space *mapping,
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index b21a3cd667d8..256d9597f0cf 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -221,12 +221,10 @@ int btrfs_truncate_free_space_cache(struct btrfs_root *root,
                                     struct btrfs_path *path,
                                     struct inode *inode)
 {
-        loff_t oldsize;
         int ret = 0;
 
-        oldsize = i_size_read(inode);
         btrfs_i_size_write(inode, 0);
-        truncate_pagecache(inode, oldsize, 0);
+        truncate_pagecache(inode, 0);
 
         /*
          * We don't need an orphan item because truncating the free space cache
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 7bdc83d04d54..82fdd7059d10 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4409,7 +4409,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)
                 inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb);
 
         if (newsize > oldsize) {
-                truncate_pagecache(inode, oldsize, newsize);
+                truncate_pagecache(inode, newsize);
                 ret = btrfs_cont_expand(inode, oldsize, newsize);
                 if (ret)
                         return ret;
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 449b6cf09b09..2a92c5c6ecfd 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1852,14 +1852,11 @@ static int cifs_truncate_page(struct address_space *mapping, loff_t from)
 
 static void cifs_setsize(struct inode *inode, loff_t offset)
 {
-        loff_t oldsize;
-
         spin_lock(&inode->i_lock);
-        oldsize = inode->i_size;
         i_size_write(inode, offset);
         spin_unlock(&inode->i_lock);
 
-        truncate_pagecache(inode, oldsize, offset);
+        truncate_pagecache(inode, offset);
 }
 
 static int
diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c
index 2ec8eb1ab269..a52a5d23c30b 100644
--- a/fs/exofs/inode.c
+++ b/fs/exofs/inode.c
@@ -861,7 +861,7 @@ static int exofs_writepage(struct page *page, struct writeback_control *wbc)
 static void _write_failed(struct inode *inode, loff_t to)
 {
         if (to > inode->i_size)
-                truncate_pagecache(inode, to, inode->i_size);
+                truncate_pagecache(inode, inode->i_size);
 }
 
 int exofs_write_begin(struct file *file, struct address_space *mapping,
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 0a87bb10998d..c260de6d7b6d 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -58,7 +58,7 @@ static void ext2_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);
                 ext2_truncate_blocks(inode, inode->i_size);
         }
 }
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index c79fd7dabe79..0d424d7ac02b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4587,7 +4587,6 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
 
         if (attr->ia_valid & ATTR_SIZE && attr->ia_size != inode->i_size) {
                 handle_t *handle;
-                loff_t oldsize = inode->i_size;
 
                 if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {
                         struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
@@ -4650,7 +4649,7 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
                  * Truncate pagecache after we've waited for commit
                  * in data=journal mode to make pages freeable.
                  */
-                truncate_pagecache(inode, oldsize, inode->i_size);
+                        truncate_pagecache(inode, inode->i_size);
         }
         /*
          * We want to call ext4_truncate() even if attr->ia_size ==
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 11b51bb55b42..0062da21dd8b 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -147,7 +147,7 @@ static void fat_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);
                 fat_truncate_blocks(inode, inode->i_size);
         }
 }
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 3ac91086f41f..62b43b577bfc 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1678,7 +1678,7 @@ int fuse_do_setattr(struct inode *inode, struct iattr *attr,
          * FUSE_NOWRITE, otherwise fuse_launder_page() would deadlock.
          */
         if (S_ISREG(inode->i_mode) && oldsize != outarg.attr.size) {
-                truncate_pagecache(inode, oldsize, outarg.attr.size);
+                truncate_pagecache(inode, outarg.attr.size);
                 invalidate_inode_pages2(inode->i_mapping);
         }
 
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 84434594e80e..a8ce6dab60a0 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -218,7 +218,7 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,
                 bool inval = false;
 
                 if (oldsize != attr->size) {
-                        truncate_pagecache(inode, oldsize, attr->size);
+                        truncate_pagecache(inode, attr->size);
                         inval = true;
                 } else if (fc->auto_inval_data) {
                         struct timespec new_mtime = {
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 5e2f56fccf6b..62a65fc448dc 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -1016,7 +1016,7 @@ static int gfs2_journaled_truncate(struct inode *inode, u64 oldsize, u64 newsize
                 chunk = oldsize - newsize;
                 if (chunk > max_chunk)
                         chunk = max_chunk;
-                truncate_pagecache(inode, oldsize, oldsize - chunk);
+                truncate_pagecache(inode, oldsize - chunk);
                 oldsize -= chunk;
                 gfs2_trans_end(sdp);
                 error = gfs2_trans_begin(sdp, RES_DINODE, GFS2_JTRUNC_REVOKES);
@@ -1067,7 +1067,7 @@ static int trunc_start(struct inode *inode, u64 oldsize, u64 newsize)
         if (journaled)
                 error = gfs2_journaled_truncate(inode, oldsize, newsize);
         else
-                truncate_pagecache(inode, oldsize, newsize);
+                truncate_pagecache(inode, newsize);
 
         if (error) {
                 brelse(dibh);
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index f9299d8a64e3..380ab31b5e0f 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -41,7 +41,7 @@ static void hfs_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);
                 hfs_file_truncate(inode);
         }
 }
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index 4d2edaea891c..37213d075f3c 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -36,7 +36,7 @@ static void hfsplus_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);
                 hfsplus_file_truncate(inode);
         }
 }
diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
index 4e9dabcf1f4c..67c1a61e0955 100644
--- a/fs/hpfs/file.c
+++ b/fs/hpfs/file.c
@@ -138,7 +138,7 @@ static void hpfs_write_failed(struct address_space *mapping, loff_t to)
         hpfs_lock(inode->i_sb);
 
         if (to > inode->i_size) {
-                truncate_pagecache(inode, to, inode->i_size);
+                truncate_pagecache(inode, inode->i_size);
                 hpfs_truncate(inode);
         }
 
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 730f24e282a6..f4aab719add5 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -306,7 +306,7 @@ static void jfs_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);
                 jfs_truncate(inode);
         }
 }
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index df122496f328..0332109162a5 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -400,7 +400,7 @@ static void minix_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);
                 minix_truncate(inode);
         }
 }
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 87e797640828..eda8879171c4 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -541,7 +541,6 @@ EXPORT_SYMBOL_GPL(nfs_setattr);
  */
 static int nfs_vmtruncate(struct inode * inode, loff_t offset)
 {
-        loff_t oldsize;
         int err;
 
         err = inode_newsize_ok(inode, offset);
@@ -549,11 +548,10 @@ static int nfs_vmtruncate(struct inode * inode, loff_t offset)
                 goto out;
 
         spin_lock(&inode->i_lock);
-        oldsize = inode->i_size;
         i_size_write(inode, offset);
         spin_unlock(&inode->i_lock);
 
-        truncate_pagecache(inode, oldsize, offset);
+        truncate_pagecache(inode, offset);
 out:
         return err;
 }
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index b1a5277cfd18..7e350c562e0e 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -254,7 +254,7 @@ void nilfs_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);
                 nilfs_truncate(inode);
         }
 }
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index c5670b8d198c..ea4ba9daeb47 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -1768,7 +1768,7 @@ static void ntfs_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);
                 ntfs_truncate_vfs(inode);
         }
 }
diff --git a/fs/omfs/file.c b/fs/omfs/file.c
index e0d9b3e722bd..54d57d6ba68d 100644
--- a/fs/omfs/file.c
+++ b/fs/omfs/file.c
@@ -311,7 +311,7 @@ static void omfs_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);
                 omfs_truncate(inode);
         }
 }
diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c
index c1a591a4725b..66bc316927e8 100644
--- a/fs/sysv/itree.c
+++ b/fs/sysv/itree.c
@@ -469,7 +469,7 @@ static void sysv_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);
                 sysv_truncate(inode);
         }
 }
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index b6d15d349810..062b7925bca0 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -172,7 +172,7 @@ static void udf_write_failed(struct address_space *mapping, loff_t to)
         loff_t isize = inode->i_size;
 
         if (to > isize) {
-                truncate_pagecache(inode, to, isize);
+                truncate_pagecache(inode, isize);
                 if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) {
                         down_write(&iinfo->i_data_sem);
                         udf_clear_extent_cache(inode);
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index ff24e4449ece..c8ca96086784 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -531,7 +531,7 @@ static void ufs_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);
 }
 
 static int ufs_write_begin(struct file *file, struct address_space *mapping,
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 977da0ec6604..e51e581454e9 100644
--- 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))
-                        truncate_pagecache(inode, pos + len, i_size_read(inode));
+                        truncate_pagecache(inode, i_size_read(inode));
 
                 page_cache_release(page);
                 page = NULL;
@@ -1618,7 +1618,7 @@ xfs_vm_write_end(
                 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);
                 }
         }
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 3d9b503bcd00..928df792c005 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -985,7 +985,7 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
         unmap_mapping_range(mapping, holebegin, holelen, 0);
 }
 
-extern void truncate_pagecache(struct inode *inode, loff_t old, loff_t new);
+extern void truncate_pagecache(struct inode *inode, loff_t new);
 extern void truncate_setsize(struct inode *inode, loff_t newsize);
 void truncate_pagecache_range(struct inode *inode, loff_t offset, loff_t end);
 int truncate_inode_page(struct address_space *mapping, struct page *page);
diff --git a/mm/truncate.c b/mm/truncate.c
index e2e8a8a7eb9d..353b683afd6e 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -567,7 +567,6 @@ EXPORT_SYMBOL_GPL(invalidate_inode_pages2);
 /**
  * truncate_pagecache - unmap and remove pagecache that has been truncated
  * @inode: inode
- * @oldsize: old file size
  * @newsize: new file size
  *
  * inode's new i_size must already be written before truncate_pagecache
@@ -580,7 +579,7 @@ EXPORT_SYMBOL_GPL(invalidate_inode_pages2);
  * situations such as writepage being called for a page that has already
  * had its underlying blocks deallocated.
  */
-void truncate_pagecache(struct inode *inode, loff_t oldsize, loff_t newsize)
+void truncate_pagecache(struct inode *inode, loff_t newsize)
 {
         struct address_space *mapping = inode->i_mapping;
         loff_t holebegin = round_up(newsize, PAGE_SIZE);
@@ -614,12 +613,8 @@ EXPORT_SYMBOL(truncate_pagecache);
  */
 void truncate_setsize(struct inode *inode, loff_t newsize)
 {
-        loff_t oldsize;
-
-        oldsize = inode->i_size;
         i_size_write(inode, newsize);
-
-        truncate_pagecache(inode, oldsize, newsize);
+        truncate_pagecache(inode, newsize);
 }
 EXPORT_SYMBOL(truncate_setsize);