From ea6bc9550a5a677754ea6845c10bf39f3b7d8d98 Mon Sep 17 00:00:00 2001 From: Boris Burkov Date: Nov 18 2022 22:39:31 +0000 Subject: Fix patch application error in preceding corruption backport I generated the patchfiles from upstream current btrfs-progs instead of 5.16.2. As a result, one patch didn't apply, but I accidentally tested a build that wasn't applying the stack of patches. --- diff --git a/SOURCES/1114-btrfs-progs-receive-fix-silent-data-loss-after-fall-.patch b/SOURCES/1114-btrfs-progs-receive-fix-silent-data-loss-after-fall-.patch index f77ddd6..b6a8680 100644 --- a/SOURCES/1114-btrfs-progs-receive-fix-silent-data-loss-after-fall-.patch +++ b/SOURCES/1114-btrfs-progs-receive-fix-silent-data-loss-after-fall-.patch @@ -130,7 +130,7 @@ index 9f73b072..7756b42c 100644 - size_t pos; - ssize_t w; char *unencoded_data; - int sector_shift = 0; + int sector_shift; + u64 written = 0; unencoded_data = calloc(unencoded_len, 1); diff --git a/SPECS/btrfs-progs.spec b/SPECS/btrfs-progs.spec index f4755dd..03f085b 100644 --- a/SPECS/btrfs-progs.spec +++ b/SPECS/btrfs-progs.spec @@ -1,6 +1,6 @@ Name: btrfs-progs Version: 5.16.2 -Release: 1.2%{?dist} +Release: 1.3%{?dist} Summary: Userspace programs for btrfs License: GPLv2 @@ -165,6 +165,9 @@ popd %{python3_sitearch}/btrfsutil-*.egg-info/ %changelog +* Fri Nov 18 2022 Boris Burkov - 5.16.2-1.3 +- Fix patch application error in previous corruption backport + * Fri Nov 18 2022 Boris Burkov - 5.16.2-1.2 - Backport compressed receive backport corruption fix