nilfs2: drop vmtruncate

Removed vmtruncate

Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 15 insertions, 9 deletions

diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index 4d31d2cca7fd..6b49f14eac8c 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -213,6 +213,16 @@ static int nilfs_set_page_dirty(struct page *page)
         return ret;
 }
 
+void nilfs_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);
+                nilfs_truncate(inode);
+        }
+}
+
 static int nilfs_write_begin(struct file *file, struct address_space *mapping,
                              loff_t pos, unsigned len, unsigned flags,
                              struct page **pagep, void **fsdata)
@@ -227,10 +237,7 @@ static int nilfs_write_begin(struct file *file, struct address_space *mapping,
         err = block_write_begin(mapping, pos, len, flags, pagep,
                                 nilfs_get_block);
         if (unlikely(err)) {
-                loff_t isize = mapping->host->i_size;
-                if (pos + len > isize)
-                        vmtruncate(mapping->host, isize);
-
+                nilfs_write_failed(mapping, pos + len);
                 nilfs_transaction_abort(inode->i_sb);
         }
         return err;
@@ -259,6 +266,7 @@ nilfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
                 loff_t offset, unsigned long nr_segs)
 {
         struct file *file = iocb->ki_filp;
+        struct address_space *mapping = file->f_mapping;
         struct inode *inode = file->f_mapping->host;
         ssize_t size;
 
@@ -278,7 +286,7 @@ nilfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
                 loff_t end = offset + iov_length(iov, nr_segs);
 
                 if (end > isize)
-                        vmtruncate(inode, isize);
+                        nilfs_write_failed(mapping, end);
         }
 
         return size;
@@ -786,10 +794,8 @@ int nilfs_setattr(struct dentry *dentry, struct iattr *iattr)
         if ((iattr->ia_valid & ATTR_SIZE) &&
             iattr->ia_size != i_size_read(inode)) {
                 inode_dio_wait(inode);
-
-                err = vmtruncate(inode, iattr->ia_size);
-                if (unlikely(err))
-                        goto out_err;
+                truncate_setsize(inode, iattr->ia_size);
+                nilfs_truncate(inode);
         }
 
         setattr_copy(inode, iattr);