Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[cascardo/linux.git] / fs / udf / file.c

diff --git a/fs/udf/file.c b/fs/udf/file.c
index 6325706..e855bf8 100644 (file)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -94,7 +94,7 @@ static int udf_adinicb_write_begin(struct file *file,
                return -ENOMEM;
        *pagep = page;
 
-       if (!PageUptodate(page) && len != PAGE_SIZE)
+       if (!PageUptodate(page))
                __udf_adinicb_readpage(page);
        return 0;
 }
@@ -105,11 +105,25 @@ static ssize_t udf_adinicb_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
        return 0;
 }
 
+static int udf_adinicb_write_end(struct file *file, struct address_space *mapping,
+                                loff_t pos, unsigned len, unsigned copied,
+                                struct page *page, void *fsdata)
+{
+       struct inode *inode = page->mapping->host;
+       loff_t last_pos = pos + copied;
+       if (last_pos > inode->i_size)
+               i_size_write(inode, last_pos);
+       set_page_dirty(page);
+       unlock_page(page);
+       put_page(page);
+       return copied;
+}
+
 const struct address_space_operations udf_adinicb_aops = {
        .readpage       = udf_adinicb_readpage,
        .writepage      = udf_adinicb_writepage,
        .write_begin    = udf_adinicb_write_begin,
-       .write_end      = simple_write_end,
+       .write_end      = udf_adinicb_write_end,
        .direct_IO      = udf_adinicb_direct_IO,
 };