diff options
author | Marco Stornelli <marco.stornelli@gmail.com> | 2012-12-15 11:56:25 +0100 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-20 18:40:53 -0500 |
commit | 7fc7cd00f616e38973fe3acd0dc7e473da94c52e (patch) | |
tree | db11ee0952cdeb78a64c1af0a7a638ed98cb1f2b /fs/minix/inode.c | |
parent | 5dfc2821e87893695bf4751fcbbdb56f42fa2985 (diff) | |
download | blackbird-op-linux-7fc7cd00f616e38973fe3acd0dc7e473da94c52e.tar.gz blackbird-op-linux-7fc7cd00f616e38973fe3acd0dc7e473da94c52e.zip |
minix: drop vmtruncate
Removed vmtruncate
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
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) return __block_write_begin(page, pos, len, minix_get_block); } +static void minix_write_failed(struct address_space *mapping, loff_t to) +{ + struct inode *inode = mapping->host; + + if (to > inode->i_size) { + truncate_pagecache(inode, to, inode->i_size); + minix_truncate(inode); + } +} + static int minix_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned len, unsigned flags, struct page **pagep, void **fsdata) @@ -403,11 +413,8 @@ static int minix_write_begin(struct file *file, struct address_space *mapping, ret = block_write_begin(mapping, pos, len, flags, pagep, minix_get_block); - if (unlikely(ret)) { - loff_t isize = mapping->host->i_size; - if (pos + len > isize) - vmtruncate(mapping->host, isize); - } + if (unlikely(ret)) + minix_write_failed(mapping, pos + len); return ret; } |