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>
This commit is contained in:

committed by
Al Viro

parent
6e1db88d53
commit
155130a4f7
@@ -505,11 +505,14 @@ static int recover_dsync_blocks(struct nilfs_sb_info *sbi,
|
||||
}
|
||||
|
||||
pos = rb->blkoff << inode->i_blkbits;
|
||||
page = NULL;
|
||||
err = block_write_begin(NULL, inode->i_mapping, pos, blocksize,
|
||||
0, &page, NULL, nilfs_get_block);
|
||||
if (unlikely(err))
|
||||
err = block_write_begin(inode->i_mapping, pos, blocksize,
|
||||
0, &page, nilfs_get_block);
|
||||
if (unlikely(err)) {
|
||||
loff_t isize = inode->i_size;
|
||||
if (pos + blocksize > isize)
|
||||
vmtruncate(inode, isize);
|
||||
goto failed_inode;
|
||||
}
|
||||
|
||||
err = nilfs_recovery_copy_block(sbi, rb, page);
|
||||
if (unlikely(err))
|
||||
|
Reference in New Issue
Block a user