diff options
Diffstat (limited to 'fs/minix/inode.c')
-rw-r--r-- | fs/minix/inode.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index 4fc5f8ab1c44..99541cceb584 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c | |||
@@ -395,6 +395,16 @@ int minix_prepare_chunk(struct page *page, loff_t pos, unsigned len) | |||
395 | return __block_write_begin(page, pos, len, minix_get_block); | 395 | return __block_write_begin(page, pos, len, minix_get_block); |
396 | } | 396 | } |
397 | 397 | ||
398 | static void minix_write_failed(struct address_space *mapping, loff_t to) | ||
399 | { | ||
400 | struct inode *inode = mapping->host; | ||
401 | |||
402 | if (to > inode->i_size) { | ||
403 | truncate_pagecache(inode, to, inode->i_size); | ||
404 | minix_truncate(inode); | ||
405 | } | ||
406 | } | ||
407 | |||
398 | static int minix_write_begin(struct file *file, struct address_space *mapping, | 408 | static int minix_write_begin(struct file *file, struct address_space *mapping, |
399 | loff_t pos, unsigned len, unsigned flags, | 409 | loff_t pos, unsigned len, unsigned flags, |
400 | struct page **pagep, void **fsdata) | 410 | struct page **pagep, void **fsdata) |
@@ -403,11 +413,8 @@ static int minix_write_begin(struct file *file, struct address_space *mapping, | |||
403 | 413 | ||
404 | ret = block_write_begin(mapping, pos, len, flags, pagep, | 414 | ret = block_write_begin(mapping, pos, len, flags, pagep, |
405 | minix_get_block); | 415 | minix_get_block); |
406 | if (unlikely(ret)) { | 416 | if (unlikely(ret)) |
407 | loff_t isize = mapping->host->i_size; | 417 | minix_write_failed(mapping, pos + len); |
408 | if (pos + len > isize) | ||
409 | vmtruncate(mapping->host, isize); | ||
410 | } | ||
411 | 418 | ||
412 | return ret; | 419 | return ret; |
413 | } | 420 | } |