Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-08-18 07:02:05 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-08-18 07:02:05 +0200
commit011ff1dcce4cd37ee58b33e1ab3e22b1c8f5cc53 (patch)
treeaede14a390b771fbb955a38db771bdae8d999982
parent9e41c9804e5784df510514ae3411a3088cdee726 (diff)
parentcaa1588856e42ff92ecf46ae45979546521684c3 (diff)
Merge branch 'SLE15' into SLE15-AZURE
-rw-r--r--patches.suse/btrfs-add-missing-inode-version-ctime-and-mtime-upda.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches.suse/btrfs-add-missing-inode-version-ctime-and-mtime-upda.patch b/patches.suse/btrfs-add-missing-inode-version-ctime-and-mtime-upda.patch
index 878c781ffd..1b679dd9cf 100644
--- a/patches.suse/btrfs-add-missing-inode-version-ctime-and-mtime-upda.patch
+++ b/patches.suse/btrfs-add-missing-inode-version-ctime-and-mtime-upda.patch
@@ -24,14 +24,14 @@ Signed-off-by: David Sterba <dsterba@suse.com>
1 file changed, 5 insertions(+)
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
-index e4137008e12b..c043ff63564d 100644
+index e4137008e12b..320b01580f2e 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2783,6 +2783,11 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
* for detecting, at fsync time, if the inode isn't yet in the
* log tree or it's there but not up to date.
*/
-+ struct timespec64 now = current_time(inode);
++ struct timespec now = current_time(inode);
+
+ inode_inc_iversion(inode);
+ inode->i_mtime = now;