aboutsummaryrefslogtreecommitdiffstats
path: root/fs/sysv
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2010-06-04 05:29:58 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-08-09 16:47:33 -0400
commit155130a4f7848b1aac439cab6bda1a175507c71c (patch)
tree5019b14b0a9221b08959196e01e3f9326957d678 /fs/sysv
parent6e1db88d536adcbbfe562b2d4b7d6425784fff12 (diff)
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.c13
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,
468 loff_t pos, unsigned len, unsigned flags, 468 loff_t pos, unsigned len, unsigned flags,
469 struct page **pagep, void **fsdata) 469 struct page **pagep, void **fsdata)
470{ 470{
471 *pagep = NULL; 471 int ret;
472 return block_write_begin(file, mapping, pos, len, flags, pagep, fsdata, 472
473 get_block); 473 ret = block_write_begin(mapping, pos, len, flags, pagep, get_block);
474 if (unlikely(ret)) {
475 loff_t isize = mapping->host->i_size;
476 if (pos + len > isize)
477 vmtruncate(mapping->host, isize);
478 }
479
480 return ret;
474} 481}
475 482
476static sector_t sysv_bmap(struct address_space *mapping, sector_t block) 483static sector_t sysv_bmap(struct address_space *mapping, sector_t block)