Merge branch 'linus' into smp/hotplug

Apply upstream changes to avoid conflicts with pending patches.

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index d64d2a515cb2..ccb401eebc11 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1699,11 +1699,11 @@ static int f2fs_write_end(struct file *file,
         trace_f2fs_write_end(inode, pos, len, copied);
 
         set_page_dirty(page);
-        f2fs_put_page(page, 1);
 
         if (pos + copied > i_size_read(inode))
                 f2fs_i_size_write(inode, pos + copied);
 
+        f2fs_put_page(page, 1);
         f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
         return copied;
 }