From: Greg Kroah-Hartman Date: Tue, 23 Jul 2019 18:02:40 +0000 (+0200) Subject: drop broken 4.4 btrfs patch X-Git-Tag: v5.2.3~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9756d1a82cc81fdc6a85e274c7b09443c8735e4e;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken 4.4 btrfs patch --- diff --git a/queue-4.4/btrfs-add-missing-inode-version-ctime-and-mtime-updates-when-punching-hole.patch b/queue-4.4/btrfs-add-missing-inode-version-ctime-and-mtime-updates-when-punching-hole.patch deleted file mode 100644 index 8b92a29414a..00000000000 --- a/queue-4.4/btrfs-add-missing-inode-version-ctime-and-mtime-updates-when-punching-hole.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 179006688a7e888cbff39577189f2e034786d06a Mon Sep 17 00:00:00 2001 -From: Filipe Manana -Date: Wed, 19 Jun 2019 13:05:50 +0100 -Subject: Btrfs: add missing inode version, ctime and mtime updates when punching hole - -From: Filipe Manana - -commit 179006688a7e888cbff39577189f2e034786d06a upstream. - -If the range for which we are punching a hole covers only part of a page, -we end up updating the inode item but we skip the update of the inode's -iversion, mtime and ctime. Fix that by ensuring we update those properties -of the inode. - -A patch for fstests test case generic/059 that tests this as been sent -along with this fix. - -Fixes: 2aaa66558172b0 ("Btrfs: add hole punching") -Fixes: e8c1c76e804b18 ("Btrfs: add missing inode update when punching hole") -CC: stable@vger.kernel.org # 4.4+ -Signed-off-by: Filipe Manana -Signed-off-by: David Sterba -Signed-off-by: Greg Kroah-Hartman - ---- - fs/btrfs/file.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/fs/btrfs/file.c -+++ b/fs/btrfs/file.c -@@ -2586,6 +2586,11 @@ out_only_mutex: - * 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); -+ -+ inode_inc_iversion(inode); -+ inode->i_mtime = now; -+ inode->i_ctime = now; - trans = btrfs_start_transaction(root, 1); - if (IS_ERR(trans)) { - err = PTR_ERR(trans); diff --git a/queue-4.4/series b/queue-4.4/series index 07f9434b2f0..842c43ad7a1 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -73,4 +73,3 @@ drm-nouveau-i2c-enable-i2c-pads-busses-during-preinit.patch padata-use-smp_mb-in-padata_reorder-to-avoid-orphaned-padata-jobs.patch 9p-virtio-add-cleanup-path-in-p9_virtio_init.patch pci-do-not-poll-for-pme-if-the-device-is-in-d3cold.patch -btrfs-add-missing-inode-version-ctime-and-mtime-updates-when-punching-hole.patch