From: Greg Kroah-Hartman Date: Sat, 8 Jun 2019 08:51:04 +0000 (+0200) Subject: fix up 4.14 btrfs patch X-Git-Tag: v5.1.8~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea9b9a563af698e47f6d15ce737d61671bd94e5b;p=thirdparty%2Fkernel%2Fstable-queue.git fix up 4.14 btrfs patch --- diff --git a/queue-4.14/btrfs-fix-wrong-ctime-and-mtime-of-a-directory-after-log-replay.patch b/queue-4.14/btrfs-fix-wrong-ctime-and-mtime-of-a-directory-after-log-replay.patch index 199325991a8..7344f12df5d 100644 --- a/queue-4.14/btrfs-fix-wrong-ctime-and-mtime-of-a-directory-after-log-replay.patch +++ b/queue-4.14/btrfs-fix-wrong-ctime-and-mtime-of-a-directory-after-log-replay.patch @@ -70,7 +70,7 @@ Signed-off-by: Greg Kroah-Hartman + * values (the ones it had when the fsync was done). + */ + if (!test_bit(BTRFS_FS_LOG_RECOVERING, &root->fs_info->flags)) { -+ struct timespec64 now = current_time(&parent_inode->vfs_inode); ++ struct timespec now = current_time(&parent_inode->vfs_inode); + + parent_inode->vfs_inode.i_mtime = now; + parent_inode->vfs_inode.i_ctime = now;