diff options
| author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2013-09-12 18:13:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 18:38:02 -0400 |
| commit | 7caef26767c1727d7abfbbbfbe8b2bb473430d48 (patch) | |
| tree | 909e2a3c1b0a20a976fa3f84a17a00f8a21607bf | |
| parent | 5fbc461636c32efdb9d5216d491d37a40d54535b (diff) | |
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>
| -rw-r--r-- | fs/adfs/inode.c | 2 | ||||
| -rw-r--r-- | fs/affs/file.c | 2 | ||||
| -rw-r--r-- | fs/bfs/file.c | 2 | ||||
| -rw-r--r-- | fs/btrfs/free-space-cache.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/inode.c | 2 | ||||
| -rw-r--r-- | fs/cifs/inode.c | 5 | ||||
| -rw-r--r-- | fs/exofs/inode.c | 2 | ||||
| -rw-r--r-- | fs/ext2/inode.c | 2 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 3 | ||||
| -rw-r--r-- | fs/fat/inode.c | 2 | ||||
| -rw-r--r-- | fs/fuse/dir.c | 2 | ||||
| -rw-r--r-- | fs/fuse/inode.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/bmap.c | 4 | ||||
| -rw-r--r-- | fs/hfs/inode.c | 2 | ||||
| -rw-r--r-- | fs/hfsplus/inode.c | 2 | ||||
| -rw-r--r-- | fs/hpfs/file.c | 2 | ||||
| -rw-r--r-- | fs/jfs/inode.c | 2 | ||||
| -rw-r--r-- | fs/minix/inode.c | 2 | ||||
| -rw-r--r-- | fs/nfs/inode.c | 4 | ||||
| -rw-r--r-- | fs/nilfs2/inode.c | 2 | ||||
| -rw-r--r-- | fs/ntfs/file.c | 2 | ||||
| -rw-r--r-- | fs/omfs/file.c | 2 | ||||
| -rw-r--r-- | fs/sysv/itree.c | 2 | ||||
| -rw-r--r-- | fs/udf/inode.c | 2 | ||||
| -rw-r--r-- | fs/ufs/inode.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_aops.c | 4 | ||||
| -rw-r--r-- | include/linux/mm.h | 2 | ||||
| -rw-r--r-- | mm/truncate.c | 9 |
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) | |||
| 50 | struct inode *inode = mapping->host; | 50 | struct inode *inode = mapping->host; |
| 51 | 51 | ||
| 52 | if (to > inode->i_size) | 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 | static int adfs_write_begin(struct file *file, struct address_space *mapping, | 56 | 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) | |||
| 406 | struct inode *inode = mapping->host; | 406 | struct inode *inode = mapping->host; |
| 407 | 407 | ||
| 408 | if (to > inode->i_size) { | 408 | if (to > inode->i_size) { |
| 409 | truncate_pagecache(inode, to, inode->i_size); | 409 | truncate_pagecache(inode, inode->i_size); |
| 410 | affs_truncate(inode); | 410 | affs_truncate(inode); |
| 411 | } | 411 | } |
| 412 | } | 412 | } |
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) | |||
| 166 | struct inode *inode = mapping->host; | 166 | struct inode *inode = mapping->host; |
| 167 | 167 | ||
| 168 | if (to > inode->i_size) | 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 | static int bfs_write_begin(struct file *file, struct address_space *mapping, | 172 | 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, | |||
| 221 | struct btrfs_path *path, | 221 | struct btrfs_path *path, |
| 222 | struct inode *inode) | 222 | struct inode *inode) |
| 223 | { | 223 | { |
| 224 | loff_t oldsize; | ||
| 225 | int ret = 0; | 224 | int ret = 0; |
| 226 | 225 | ||
| 227 | oldsize = i_size_read(inode); | ||
| 228 | btrfs_i_size_write(inode, 0); | 226 | btrfs_i_size_write(inode, 0); |
| 229 | truncate_pagecache(inode, oldsize, 0); | 227 | truncate_pagecache(inode, 0); |
| 230 | 228 | ||
| 231 | /* | 229 | /* |
| 232 | * We don't need an orphan item because truncating the free space cache | 230 | * 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) | |||
| 4409 | inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb); | 4409 | inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb); |
| 4410 | 4410 | ||
| 4411 | if (newsize > oldsize) { | 4411 | if (newsize > oldsize) { |
| 4412 | truncate_pagecache(inode, oldsize, newsize); | 4412 | truncate_pagecache(inode, newsize); |
| 4413 | ret = btrfs_cont_expand(inode, oldsize, newsize); | 4413 | ret = btrfs_cont_expand(inode, oldsize, newsize); |
| 4414 | if (ret) | 4414 | if (ret) |
| 4415 | return ret; | 4415 | 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) | |||
| 1852 | 1852 | ||
| 1853 | static void cifs_setsize(struct inode *inode, loff_t offset) | 1853 | static void cifs_setsize(struct inode *inode, loff_t offset) |
| 1854 | { | 1854 | { |
| 1855 | loff_t oldsize; | ||
| 1856 | |||
| 1857 | spin_lock(&inode->i_lock); | 1855 | spin_lock(&inode->i_lock); |
| 1858 | oldsize = inode->i_size; | ||
| 1859 | i_size_write(inode, offset); | 1856 | i_size_write(inode, offset); |
| 1860 | spin_unlock(&inode->i_lock); | 1857 | spin_unlock(&inode->i_lock); |
| 1861 | 1858 | ||
| 1862 | truncate_pagecache(inode, oldsize, offset); | 1859 | truncate_pagecache(inode, offset); |
| 1863 | } | 1860 | } |
| 1864 | 1861 | ||
| 1865 | static int | 1862 | 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) | |||
| 861 | static void _write_failed(struct inode *inode, loff_t to) | 861 | static void _write_failed(struct inode *inode, loff_t to) |
| 862 | { | 862 | { |
| 863 | if (to > inode->i_size) | 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 | int exofs_write_begin(struct file *file, struct address_space *mapping, | 867 | 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) | |||
| 58 | struct inode *inode = mapping->host; | 58 | struct inode *inode = mapping->host; |
| 59 | 59 | ||
| 60 | if (to > inode->i_size) { | 60 | if (to > inode->i_size) { |
| 61 | truncate_pagecache(inode, to, inode->i_size); | 61 | truncate_pagecache(inode, inode->i_size); |
| 62 | ext2_truncate_blocks(inode, inode->i_size); | 62 | ext2_truncate_blocks(inode, inode->i_size); |
| 63 | } | 63 | } |
| 64 | } | 64 | } |
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) | |||
| 4587 | 4587 | ||
| 4588 | if (attr->ia_valid & ATTR_SIZE && attr->ia_size != inode->i_size) { | 4588 | if (attr->ia_valid & ATTR_SIZE && attr->ia_size != inode->i_size) { |
| 4589 | handle_t *handle; | 4589 | handle_t *handle; |
| 4590 | loff_t oldsize = inode->i_size; | ||
| 4591 | 4590 | ||
| 4592 | if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) { | 4591 | if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) { |
| 4593 | struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); | 4592 | struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); |
| @@ -4650,7 +4649,7 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) | |||
| 4650 | * Truncate pagecache after we've waited for commit | 4649 | * Truncate pagecache after we've waited for commit |
| 4651 | * in data=journal mode to make pages freeable. | 4650 | * in data=journal mode to make pages freeable. |
| 4652 | */ | 4651 | */ |
| 4653 | truncate_pagecache(inode, oldsize, inode->i_size); | 4652 | truncate_pagecache(inode, inode->i_size); |
| 4654 | } | 4653 | } |
| 4655 | /* | 4654 | /* |
| 4656 | * We want to call ext4_truncate() even if attr->ia_size == | 4655 | * 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) | |||
| 147 | struct inode *inode = mapping->host; | 147 | struct inode *inode = mapping->host; |
| 148 | 148 | ||
| 149 | if (to > inode->i_size) { | 149 | if (to > inode->i_size) { |
| 150 | truncate_pagecache(inode, to, inode->i_size); | 150 | truncate_pagecache(inode, inode->i_size); |
| 151 | fat_truncate_blocks(inode, inode->i_size); | 151 | fat_truncate_blocks(inode, inode->i_size); |
| 152 | } | 152 | } |
| 153 | } | ||
