diff options
| author | Christoph Hellwig <hch@lst.de> | 2010-06-04 11:29:58 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:47:33 -0400 |
| commit | 155130a4f7848b1aac439cab6bda1a175507c71c (patch) | |
| tree | 5019b14b0a9221b08959196e01e3f9326957d678 /fs/sysv | |
| parent | 6e1db88d536adcbbfe562b2d4b7d6425784fff12 (diff) | |
| download | kernel-common-155130a4f7848b1aac439cab6bda1a175507c71c.tar.gz kernel-common-155130a4f7848b1aac439cab6bda1a175507c71c.tar.bz2 kernel-common-155130a4f7848b1aac439cab6bda1a175507c71c.zip | |
get rid of block_write_begin_newtrunc
Move the call to vmtruncate to get rid of accessive blocks to the callers
in preparation of the new truncate sequence and rename the non-truncating
version to block_write_begin.
While we're at it also remove several unused arguments to block_write_begin.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/sysv')
| -rw-r--r-- | fs/sysv/itree.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c index 82a005c3d7eb..9ca66276315e 100644 --- a/fs/sysv/itree.c +++ b/fs/sysv/itree.c @@ -468,9 +468,16 @@ static int sysv_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned len, unsigned flags, struct page **pagep, void **fsdata) { - *pagep = NULL; - return block_write_begin(file, mapping, pos, len, flags, pagep, fsdata, - get_block); + int ret; + + ret = block_write_begin(mapping, pos, len, flags, pagep, 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 sysv_bmap(struct address_space *mapping, sector_t block) |