diff options
Diffstat (limited to 'fs/nilfs2')
-rw-r--r-- | fs/nilfs2/inode.c | 12 | ||||
-rw-r--r-- | fs/nilfs2/recovery.c | 11 |
2 files changed, 15 insertions, 8 deletions
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 1dd9e6a7d787..5c694ece172e 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c | |||
@@ -197,11 +197,15 @@ static int nilfs_write_begin(struct file *file, struct address_space *mapping, | |||
197 | if (unlikely(err)) | 197 | if (unlikely(err)) |
198 | return err; | 198 | return err; |
199 | 199 | ||
200 | *pagep = NULL; | 200 | err = block_write_begin(mapping, pos, len, flags, pagep, |
201 | err = block_write_begin(file, mapping, pos, len, flags, pagep, | 201 | nilfs_get_block); |
202 | fsdata, nilfs_get_block); | 202 | if (unlikely(err)) { |
203 | if (unlikely(err)) | 203 | loff_t isize = mapping->host->i_size; |
204 | if (pos + len > isize) | ||
205 | vmtruncate(mapping->host, isize); | ||
206 | |||
204 | nilfs_transaction_abort(inode->i_sb); | 207 | nilfs_transaction_abort(inode->i_sb); |
208 | } | ||
205 | return err; | 209 | return err; |
206 | } | 210 | } |
207 | 211 | ||
diff --git a/fs/nilfs2/recovery.c b/fs/nilfs2/recovery.c index bae2a516b4ee..2f11f0868d87 100644 --- a/fs/nilfs2/recovery.c +++ b/fs/nilfs2/recovery.c | |||
@@ -505,11 +505,14 @@ static int recover_dsync_blocks(struct nilfs_sb_info *sbi, | |||
505 | } | 505 | } |
506 | 506 | ||
507 | pos = rb->blkoff << inode->i_blkbits; | 507 | pos = rb->blkoff << inode->i_blkbits; |
508 | page = NULL; | 508 | err = block_write_begin(inode->i_mapping, pos, blocksize, |
509 | err = block_write_begin(NULL, inode->i_mapping, pos, blocksize, | 509 | 0, &page, nilfs_get_block); |
510 | 0, &page, NULL, nilfs_get_block); | 510 | if (unlikely(err)) { |
511 | if (unlikely(err)) | 511 | loff_t isize = inode->i_size; |
512 | if (pos + blocksize > isize) | ||
513 | vmtruncate(inode, isize); | ||
512 | goto failed_inode; | 514 | goto failed_inode; |
515 | } | ||
513 | 516 | ||
514 | err = nilfs_recovery_copy_block(sbi, rb, page); | 517 | err = nilfs_recovery_copy_block(sbi, rb, page); |
515 | if (unlikely(err)) | 518 | if (unlikely(err)) |