Merge tag 'nios2-v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...

[sfrench/cifs-2.6.git] / fs / buffer.c

diff --git a/fs/buffer.c b/fs/buffer.c
index e450c55f643424efcc4e992d9012378fcd602421..49a8715700926ecf2e75446eb0c6debd65615d43 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2086,38 +2086,6 @@ int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,
 }
 EXPORT_SYMBOL(block_write_begin);
 
-void __generic_write_end(struct inode *inode, loff_t pos, unsigned copied,
-               struct page *page)
-{
-       loff_t old_size = inode->i_size;
-       bool i_size_changed = false;
-
-       /*
-        * No need to use i_size_read() here, the i_size cannot change under us
-        * because we hold i_rwsem.
-        *
-        * But it's important to update i_size while still holding page lock:
-        * page writeout could otherwise come in and zero beyond i_size.
-        */
-       if (pos + copied > inode->i_size) {
-               i_size_write(inode, pos + copied);
-               i_size_changed = true;
-       }
-
-       unlock_page(page);
-
-       if (old_size < pos)
-               pagecache_isize_extended(inode, old_size, pos);
-       /*
-        * Don't mark the inode dirty under page lock. First, it unnecessarily
-        * makes the holding time of page lock longer. Second, it forces lock
-        * ordering of page lock and transaction start for journaling
-        * filesystems.
-        */
-       if (i_size_changed)
-               mark_inode_dirty(inode);
-}
-
 int block_write_end(struct file *file, struct address_space *mapping,
                        loff_t pos, unsigned len, unsigned copied,
                        struct page *page, void *fsdata)
@@ -2158,9 +2126,37 @@ int generic_write_end(struct file *file, struct address_space *mapping,
                        loff_t pos, unsigned len, unsigned copied,
                        struct page *page, void *fsdata)
 {
+       struct inode *inode = mapping->host;
+       loff_t old_size = inode->i_size;
+       bool i_size_changed = false;
+
        copied = block_write_end(file, mapping, pos, len, copied, page, fsdata);
-       __generic_write_end(mapping->host, pos, copied, page);
+
+       /*
+        * No need to use i_size_read() here, the i_size cannot change under us
+        * because we hold i_rwsem.
+        *
+        * But it's important to update i_size while still holding page lock:
+        * page writeout could otherwise come in and zero beyond i_size.
+        */
+       if (pos + copied > inode->i_size) {
+               i_size_write(inode, pos + copied);
+               i_size_changed = true;
+       }
+
+       unlock_page(page);
        put_page(page);
+
+       if (old_size < pos)
+               pagecache_isize_extended(inode, old_size, pos);
+       /*
+        * Don't mark the inode dirty under page lock. First, it unnecessarily
+        * makes the holding time of page lock longer. Second, it forces lock
+        * ordering of page lock and transaction start for journaling
+        * filesystems.
+        */
+       if (i_size_changed)
+               mark_inode_dirty(inode);
        return copied;
 }
 EXPORT_SYMBOL(generic_write_end);