Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 2 insertions, 4 deletions

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 0ad2b95fca12..de3dc98f4e8f 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -1268,8 +1268,7 @@ xfs_seek_data(
         }
 
 out:
-        if (offset != file->f_pos)
-                file->f_pos = offset;
+        offset = vfs_setpos(file, offset, inode->i_sb->s_maxbytes);
 
 out_unlock:
         xfs_iunlock_map_shared(ip, lock);
@@ -1377,8 +1376,7 @@ out:
          * situation in particular.
          */
         offset = min_t(loff_t, offset, isize);
-        if (offset != file->f_pos)
-                file->f_pos = offset;
+        offset = vfs_setpos(file, offset, inode->i_sb->s_maxbytes);
 
 out_unlock:
         xfs_iunlock_map_shared(ip, lock);