]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
adfs: drop vmtruncate
authorMarco Stornelli <marco.stornelli@gmail.com>
Sat, 15 Dec 2012 10:51:11 +0000 (11:51 +0100)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 20 Dec 2012 19:00:01 +0000 (14:00 -0500)
Removed vmtruncate

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

index e9bad5093a3f92f45761a534e38cae37661fddea..5f95d1ed9c6dbf882e3b73e85b6cf0469f7d63af 100644 (file)
@@ -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;
 }