Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Kirill A. Shutemov and committed by
Linus Torvalds
7caef267 5fbc4616

+31 -44
+1 -1
fs/adfs/inode.c
··· 50 50 struct inode *inode = mapping->host; 51 51 52 52 if (to > inode->i_size) 53 - truncate_pagecache(inode, to, inode->i_size); 53 + truncate_pagecache(inode, inode->i_size); 54 54 } 55 55 56 56 static int adfs_write_begin(struct file *file, struct address_space *mapping,
+1 -1
fs/affs/file.c
··· 406 406 struct inode *inode = mapping->host; 407 407 408 408 if (to > inode->i_size) { 409 - truncate_pagecache(inode, to, inode->i_size); 409 + truncate_pagecache(inode, inode->i_size); 410 410 affs_truncate(inode); 411 411 } 412 412 }
+1 -1
fs/bfs/file.c
··· 166 166 struct inode *inode = mapping->host; 167 167 168 168 if (to > inode->i_size) 169 - truncate_pagecache(inode, to, inode->i_size); 169 + truncate_pagecache(inode, inode->i_size); 170 170 } 171 171 172 172 static int bfs_write_begin(struct file *file, struct address_space *mapping,
+1 -3
fs/btrfs/free-space-cache.c
··· 221 221 struct btrfs_path *path, 222 222 struct inode *inode) 223 223 { 224 - loff_t oldsize; 225 224 int ret = 0; 226 225 227 - oldsize = i_size_read(inode); 228 226 btrfs_i_size_write(inode, 0); 229 - truncate_pagecache(inode, oldsize, 0); 227 + truncate_pagecache(inode, 0); 230 228 231 229 /* 232 230 * We don't need an orphan item because truncating the free space cache
+1 -1
fs/btrfs/inode.c
··· 4409 4409 inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb); 4410 4410 4411 4411 if (newsize > oldsize) { 4412 - truncate_pagecache(inode, oldsize, newsize); 4412 + truncate_pagecache(inode, newsize); 4413 4413 ret = btrfs_cont_expand(inode, oldsize, newsize); 4414 4414 if (ret) 4415 4415 return ret;
+1 -4
fs/cifs/inode.c
··· 1852 1852 1853 1853 static void cifs_setsize(struct inode *inode, loff_t offset) 1854 1854 { 1855 - loff_t oldsize; 1856 - 1857 1855 spin_lock(&inode->i_lock); 1858 - oldsize = inode->i_size; 1859 1856 i_size_write(inode, offset); 1860 1857 spin_unlock(&inode->i_lock); 1861 1858 1862 - truncate_pagecache(inode, oldsize, offset); 1859 + truncate_pagecache(inode, offset); 1863 1860 } 1864 1861 1865 1862 static int
+1 -1
fs/exofs/inode.c
··· 861 861 static void _write_failed(struct inode *inode, loff_t to) 862 862 { 863 863 if (to > inode->i_size) 864 - truncate_pagecache(inode, to, inode->i_size); 864 + truncate_pagecache(inode, inode->i_size); 865 865 } 866 866 867 867 int exofs_write_begin(struct file *file, struct address_space *mapping,
+1 -1
fs/ext2/inode.c
··· 58 58 struct inode *inode = mapping->host; 59 59 60 60 if (to > inode->i_size) { 61 - truncate_pagecache(inode, to, inode->i_size); 61 + truncate_pagecache(inode, inode->i_size); 62 62 ext2_truncate_blocks(inode, inode->i_size); 63 63 } 64 64 }
+1 -2
fs/ext4/inode.c
··· 4587 4587 4588 4588 if (attr->ia_valid & ATTR_SIZE && attr->ia_size != inode->i_size) { 4589 4589 handle_t *handle; 4590 - loff_t oldsize = inode->i_size; 4591 4590 4592 4591 if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) { 4593 4592 struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); ··· 4649 4650 * Truncate pagecache after we've waited for commit 4650 4651 * in data=journal mode to make pages freeable. 4651 4652 */ 4652 - truncate_pagecache(inode, oldsize, inode->i_size); 4653 + truncate_pagecache(inode, inode->i_size); 4653 4654 } 4654 4655 /* 4655 4656 * We want to call ext4_truncate() even if attr->ia_size ==
+1 -1
fs/fat/inode.c
··· 147 147 struct inode *inode = mapping->host; 148 148 149 149 if (to > inode->i_size) { 150 - truncate_pagecache(inode, to, inode->i_size); 150 + truncate_pagecache(inode, inode->i_size); 151 151 fat_truncate_blocks(inode, inode->i_size); 152 152 } 153 153 }
+1 -1
fs/fuse/dir.c
··· 1678 1678 * FUSE_NOWRITE, otherwise fuse_launder_page() would deadlock. 1679 1679 */ 1680 1680 if (S_ISREG(inode->i_mode) && oldsize != outarg.attr.size) { 1681 - truncate_pagecache(inode, oldsize, outarg.attr.size); 1681 + truncate_pagecache(inode, outarg.attr.size); 1682 1682 invalidate_inode_pages2(inode->i_mapping); 1683 1683 } 1684 1684
+1 -1
fs/fuse/inode.c
··· 218 218 bool inval = false; 219 219 220 220 if (oldsize != attr->size) { 221 - truncate_pagecache(inode, oldsize, attr->size); 221 + truncate_pagecache(inode, attr->size); 222 222 inval = true; 223 223 } else if (fc->auto_inval_data) { 224 224 struct timespec new_mtime = {
+2 -2
fs/gfs2/bmap.c
··· 1016 1016 chunk = oldsize - newsize; 1017 1017 if (chunk > max_chunk) 1018 1018 chunk = max_chunk; 1019 - truncate_pagecache(inode, oldsize, oldsize - chunk); 1019 + truncate_pagecache(inode, oldsize - chunk); 1020 1020 oldsize -= chunk; 1021 1021 gfs2_trans_end(sdp); 1022 1022 error = gfs2_trans_begin(sdp, RES_DINODE, GFS2_JTRUNC_REVOKES); ··· 1067 1067 if (journaled) 1068 1068 error = gfs2_journaled_truncate(inode, oldsize, newsize); 1069 1069 else 1070 - truncate_pagecache(inode, oldsize, newsize); 1070 + truncate_pagecache(inode, newsize); 1071 1071 1072 1072 if (error) { 1073 1073 brelse(dibh);
+1 -1
fs/hfs/inode.c
··· 41 41 struct inode *inode = mapping->host; 42 42 43 43 if (to > inode->i_size) { 44 - truncate_pagecache(inode, to, inode->i_size); 44 + truncate_pagecache(inode, inode->i_size); 45 45 hfs_file_truncate(inode); 46 46 } 47 47 }
+1 -1
fs/hfsplus/inode.c
··· 36 36 struct inode *inode = mapping->host; 37 37 38 38 if (to > inode->i_size) { 39 - truncate_pagecache(inode, to, inode->i_size); 39 + truncate_pagecache(inode, inode->i_size); 40 40 hfsplus_file_truncate(inode); 41 41 } 42 42 }
+1 -1
fs/hpfs/file.c
··· 138 138 hpfs_lock(inode->i_sb); 139 139 140 140 if (to > inode->i_size) { 141 - truncate_pagecache(inode, to, inode->i_size); 141 + truncate_pagecache(inode, inode->i_size); 142 142 hpfs_truncate(inode); 143 143 } 144 144
+1 -1
fs/jfs/inode.c
··· 306 306 struct inode *inode = mapping->host; 307 307 308 308 if (to > inode->i_size) { 309 - truncate_pagecache(inode, to, inode->i_size); 309 + truncate_pagecache(inode, inode->i_size); 310 310 jfs_truncate(inode); 311 311 } 312 312 }
+1 -1
fs/minix/inode.c
··· 400 400 struct inode *inode = mapping->host; 401 401 402 402 if (to > inode->i_size) { 403 - truncate_pagecache(inode, to, inode->i_size); 403 + truncate_pagecache(inode, inode->i_size); 404 404 minix_truncate(inode); 405 405 } 406 406 }
+1 -3
fs/nfs/inode.c
··· 541 541 */ 542 542 static int nfs_vmtruncate(struct inode * inode, loff_t offset) 543 543 { 544 - loff_t oldsize; 545 544 int err; 546 545 547 546 err = inode_newsize_ok(inode, offset); ··· 548 549 goto out; 549 550 550 551 spin_lock(&inode->i_lock); 551 - oldsize = inode->i_size; 552 552 i_size_write(inode, offset); 553 553 spin_unlock(&inode->i_lock); 554 554 555 - truncate_pagecache(inode, oldsize, offset); 555 + truncate_pagecache(inode, offset); 556 556 out: 557 557 return err; 558 558 }
+1 -1
fs/nilfs2/inode.c
··· 254 254 struct inode *inode = mapping->host; 255 255 256 256 if (to > inode->i_size) { 257 - truncate_pagecache(inode, to, inode->i_size); 257 + truncate_pagecache(inode, inode->i_size); 258 258 nilfs_truncate(inode); 259 259 } 260 260 }
+1 -1
fs/ntfs/file.c
··· 1768 1768 struct inode *inode = mapping->host; 1769 1769 1770 1770 if (to > inode->i_size) { 1771 - truncate_pagecache(inode, to, inode->i_size); 1771 + truncate_pagecache(inode, inode->i_size); 1772 1772 ntfs_truncate_vfs(inode); 1773 1773 } 1774 1774 }
+1 -1
fs/omfs/file.c
··· 311 311 struct inode *inode = mapping->host; 312 312 313 313 if (to > inode->i_size) { 314 - truncate_pagecache(inode, to, inode->i_size); 314 + truncate_pagecache(inode, inode->i_size); 315 315 omfs_truncate(inode); 316 316 } 317 317 }
+1 -1
fs/sysv/itree.c
··· 469 469 struct inode *inode = mapping->host; 470 470 471 471 if (to > inode->i_size) { 472 - truncate_pagecache(inode, to, inode->i_size); 472 + truncate_pagecache(inode, inode->i_size); 473 473 sysv_truncate(inode); 474 474 } 475 475 }
+1 -1
fs/udf/inode.c
··· 172 172 loff_t isize = inode->i_size; 173 173 174 174 if (to > isize) { 175 - truncate_pagecache(inode, to, isize); 175 + truncate_pagecache(inode, isize); 176 176 if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) { 177 177 down_write(&iinfo->i_data_sem); 178 178 udf_clear_extent_cache(inode);
+1 -1
fs/ufs/inode.c
··· 531 531 struct inode *inode = mapping->host; 532 532 533 533 if (to > inode->i_size) 534 - truncate_pagecache(inode, to, inode->i_size); 534 + truncate_pagecache(inode, inode->i_size); 535 535 } 536 536 537 537 static int ufs_write_begin(struct file *file, struct address_space *mapping,
+2 -2
fs/xfs/xfs_aops.c
··· 1582 1582 unlock_page(page); 1583 1583 1584 1584 if (pos + len > i_size_read(inode)) 1585 - truncate_pagecache(inode, pos + len, i_size_read(inode)); 1585 + truncate_pagecache(inode, i_size_read(inode)); 1586 1586 1587 1587 page_cache_release(page); 1588 1588 page = NULL; ··· 1618 1618 loff_t to = pos + len; 1619 1619 1620 1620 if (to > isize) { 1621 - truncate_pagecache(inode, to, isize); 1621 + truncate_pagecache(inode, isize); 1622 1622 xfs_vm_kill_delalloc_range(inode, isize, to); 1623 1623 } 1624 1624 }
+1 -1
include/linux/mm.h
··· 985 985 unmap_mapping_range(mapping, holebegin, holelen, 0); 986 986 } 987 987 988 - extern void truncate_pagecache(struct inode *inode, loff_t old, loff_t new); 988 + extern void truncate_pagecache(struct inode *inode, loff_t new); 989 989 extern void truncate_setsize(struct inode *inode, loff_t newsize); 990 990 void truncate_pagecache_range(struct inode *inode, loff_t offset, loff_t end); 991 991 int truncate_inode_page(struct address_space *mapping, struct page *page);
+2 -7
mm/truncate.c
··· 567 567 /** 568 568 * truncate_pagecache - unmap and remove pagecache that has been truncated 569 569 * @inode: inode 570 - * @oldsize: old file size 571 570 * @newsize: new file size 572 571 * 573 572 * inode's new i_size must already be written before truncate_pagecache ··· 579 580 * situations such as writepage being called for a page that has already 580 581 * had its underlying blocks deallocated. 581 582 */ 582 - void truncate_pagecache(struct inode *inode, loff_t oldsize, loff_t newsize) 583 + void truncate_pagecache(struct inode *inode, loff_t newsize) 583 584 { 584 585 struct address_space *mapping = inode->i_mapping; 585 586 loff_t holebegin = round_up(newsize, PAGE_SIZE); ··· 613 614 */ 614 615 void truncate_setsize(struct inode *inode, loff_t newsize) 615 616 { 616 - loff_t oldsize; 617 - 618 - oldsize = inode->i_size; 619 617 i_size_write(inode, newsize); 620 - 621 - truncate_pagecache(inode, oldsize, newsize); 618 + truncate_pagecache(inode, newsize); 622 619 } 623 620 EXPORT_SYMBOL(truncate_setsize); 624 621