PR#4: Fix patch application error in preceding corruption backport - rpms/btrfs-progs

rpms / btrfs-progs

#4 Fix patch application error in preceding corruption backport

Merged 2 years ago by dcavalca. Opened 2 years ago by borisb.

rpms/ borisb/btrfs-progs recv-fix-c9-2 into c9s-sig-hyperscale

Fix patch application error in preceding corruption backport

Boris Burkov • 2 years ago

ea6bc9

SOURCES/1114-btrfs-progs-receive-fix-silent-data-loss-after-fall-.patch

file modified

+1 -1

		`@@ -130,7 +130,7 @@`
		`- 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);`

SPECS/btrfs-progs.spec

file modified

+4 -1

		`@@ -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 @@`
		`%{python3_sitearch}/btrfsutil-*.egg-info/`

		`%changelog`
		`+ * Fri Nov 18 2022 Boris Burkov <boris@bur.io> - 5.16.2-1.3`
		`+ - Fix patch application error in previous corruption backport`
		`+`
		`* Fri Nov 18 2022 Boris Burkov <boris@bur.io> - 5.16.2-1.2`
		`- Backport compressed receive backport corruption fix`

borisb commented 2 years ago

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.