diff options
| author | Christoph Hellwig <hch@lst.de> | 2010-06-04 11:29:54 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:47:30 -0400 |
| commit | ea0f04e59543bafb3d2cbe37a0d375acb0bb2c34 (patch) | |
| tree | 66a400f5b8e9a01acb72107c72e504325af6fe67 /fs/jfs | |
| parent | eafdc7d190a944c755a9fe68573c193e6e0217e7 (diff) | |
| download | linux-ea0f04e59543bafb3d2cbe37a0d375acb0bb2c34.tar.gz linux-ea0f04e59543bafb3d2cbe37a0d375acb0bb2c34.tar.bz2 linux-ea0f04e59543bafb3d2cbe37a0d375acb0bb2c34.zip | |
get rid of nobh_write_begin_newtrunc
Move the call to vmtruncate to get rid of accessive blocks to the only
remaining caller and rename the non-truncating version to nobh_write_begin.
Get rid of the superflous file argument to it while we're at it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/jfs')
| -rw-r--r-- | fs/jfs/inode.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c index 79e6cda28181..c38dc1806281 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c @@ -303,8 +303,17 @@ static int jfs_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned len, unsigned flags, struct page **pagep, void **fsdata) { - return nobh_write_begin(file, mapping, pos, len, flags, pagep, fsdata, + int ret; + + ret = nobh_write_begin(mapping, pos, len, flags, pagep, fsdata, jfs_get_block); + if (unlikely(ret)) { + loff_t isize = mapping->host->i_size; + if (pos + len > isize) + vmtruncate(mapping->host, isize); + } + + return ret; } static sector_t jfs_bmap(struct address_space *mapping, sector_t block) |