summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMarco Stornelli <marco.stornelli@gmail.com>2012-12-15 11:51:11 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2012-12-20 14:00:01 -0500
commit62295183846234b423a67116c36e00bd29dfd856 (patch)
treeaab0c3c3e92e763d32898491b9f85de6b41ad5db /fs
parenta6ff03771e9d4a2a64cd1414e32c6b369ae935ba (diff)
downloadlinux-3.10-62295183846234b423a67116c36e00bd29dfd856.tar.gz
linux-3.10-62295183846234b423a67116c36e00bd29dfd856.tar.bz2
linux-3.10-62295183846234b423a67116c36e00bd29dfd856.zip
adfs: 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')
-rw-r--r--fs/adfs/inode.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c
index e9bad5093a3..5f95d1ed9c6 100644
--- a/fs/adfs/inode.c
+++ b/fs/adfs/inode.c
@@ -45,6 +45,14 @@ static int adfs_readpage(struct file *file, struct page *page)
return block_read_full_page(page, adfs_get_block);
}
+static void adfs_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);
+}
+
static int adfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, unsigned flags,
struct page **pagep, void **fsdata)
@@ -55,11 +63,8 @@ static int adfs_write_begin(struct file *file, struct address_space *mapping,
ret = cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
adfs_get_block,
&ADFS_I(mapping->host)->mmu_private);
- if (unlikely(ret)) {
- loff_t isize = mapping->host->i_size;
- if (pos + len > isize)
- vmtruncate(mapping->host, isize);
- }
+ if (unlikely(ret))
+ adfs_write_failed(mapping, pos + len);
return ret;
}