diff options
author | Marco Stornelli <marco.stornelli@gmail.com> | 2012-12-15 05:45:14 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-20 14:00:01 -0500 |
commit | 83f6e3710a932d400100767ad445a4bd9476e083 (patch) | |
tree | d4ddaa81088ce772e956059b7e492b8527391309 | |
parent | 72651cac884b1e285fa8e8314b10e9f1b8458802 (diff) |
ufs: drop vmtruncate
Removed vmtruncate
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/ufs/inode.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index eb6d0b7dc879..ff24e4449ece 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c | |||
@@ -526,6 +526,14 @@ int ufs_prepare_chunk(struct page *page, loff_t pos, unsigned len) | |||
526 | return __block_write_begin(page, pos, len, ufs_getfrag_block); | 526 | return __block_write_begin(page, pos, len, ufs_getfrag_block); |
527 | } | 527 | } |
528 | 528 | ||
529 | static void ufs_write_failed(struct address_space *mapping, loff_t to) | ||
530 | { | ||
531 | struct inode *inode = mapping->host; | ||
532 | |||
533 | if (to > inode->i_size) | ||
534 | truncate_pagecache(inode, to, inode->i_size); | ||
535 | } | ||
536 | |||
529 | static int ufs_write_begin(struct file *file, struct address_space *mapping, | 537 | static int ufs_write_begin(struct file *file, struct address_space *mapping, |
530 | loff_t pos, unsigned len, unsigned flags, | 538 | loff_t pos, unsigned len, unsigned flags, |
531 | struct page **pagep, void **fsdata) | 539 | struct page **pagep, void **fsdata) |
@@ -534,11 +542,8 @@ static int ufs_write_begin(struct file *file, struct address_space *mapping, | |||
534 | 542 | ||
535 | ret = block_write_begin(mapping, pos, len, flags, pagep, | 543 | ret = block_write_begin(mapping, pos, len, flags, pagep, |
536 | ufs_getfrag_block); | 544 | ufs_getfrag_block); |
537 | if (unlikely(ret)) { | 545 | if (unlikely(ret)) |
538 | loff_t isize = mapping->host->i_size; | 546 | ufs_write_failed(mapping, pos + len); |
539 | if (pos + len > isize) | ||
540 | vmtruncate(mapping->host, isize); | ||
541 | } | ||
542 | 547 | ||
543 | return ret; | 548 | return ret; |
544 | } | 549 | } |