Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2021-10-05 22:33:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old) and /work/SRC/openSUSE:Factory/.btrfsprogs.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btrfsprogs" Tue Oct 5 22:33:30 2021 rev:123 rq:922132 version:5.14.1 Changes: -------- --- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2021-09-20 23:31:53.099079572 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new.2443/btrfsprogs.changes 2021-10-05 22:33:45.850860122 +0200 @@ -1,0 +2,11 @@ +Wed Sep 22 00:00:00 CEST 2021 - dste...@suse.cz + +- Update to 5.14.1 +* fixes: + * defrag: fix parsing of compression (option -c) + * add workaround for old kernels when reading zone sizes + * let only check and restore open the fs with transid failures, namely + preventing btrfstune to do so + * convert: --uuid copy does not fail on duplicate uuids + +------------------------------------------------------------------- Old: ---- btrfs-progs-v5.14.tar.gz New: ---- btrfs-progs-v5.14.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.Kg8MZD/_old 2021-10-05 22:33:46.350860991 +0200 +++ /var/tmp/diff_new_pack.Kg8MZD/_new 2021-10-05 22:33:46.354860999 +0200 @@ -34,7 +34,7 @@ %define _dracutmodulesdir %(pkg-config --variable dracutmodulesdir dracut) Name: btrfsprogs -Version: 5.14 +Version: 5.14.1 Release: 0 Summary: Utilities for the Btrfs filesystem License: GPL-2.0-only ++++++ btrfs-progs-v5.14.tar.gz -> btrfs-progs-v5.14.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/CHANGES new/btrfs-progs-v5.14.1/CHANGES --- old/btrfs-progs-v5.14/CHANGES 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/CHANGES 2021-09-20 18:09:16.000000000 +0200 @@ -1,3 +1,11 @@ +btrfs-progs-5.14.1 (2021-09-20) +* fixes: + * defrag: fix parsing of compression (option -c) + * add workaround for old kernels when reading zone sizes + * let only check and restore open the fs with transid failures, namely + preventing btrfstune to do so + * convert: --uuid copy does not fail on duplicate uuids + btrfs-progs-5.14 (2021-09-10) * convert: * new option --uuid to copy, generate or set a given uuid diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-balance.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-balance.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-balance.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-balance.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-balance .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-BALANCE" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-BALANCE" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-check.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-check.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-check.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-check.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-check .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-CHECK" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-CHECK" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-convert.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-convert.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-convert.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-convert.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-convert .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-CONVERT" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-CONVERT" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-device.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-device.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-device.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-device.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-device .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-DEVICE" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-DEVICE" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-filesystem.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-filesystem.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-filesystem.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-filesystem.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-filesystem .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-FILESYSTEM" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-FILESYSTEM" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-find-root.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-find-root.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-find-root.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-find-root.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-find-root .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-FIND\-ROOT" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-FIND\-ROOT" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-image.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-image.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-image.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-image.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-image .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-IMAGE" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-IMAGE" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-inspect-internal.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-inspect-internal.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-inspect-internal.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-inspect-internal.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-inspect-internal .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-INSPECT\-INTE" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-INSPECT\-INTE" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-map-logical.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-map-logical.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-map-logical.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-map-logical.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-map-logical .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-MAP\-LOGICAL" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-MAP\-LOGICAL" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-property.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-property.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-property.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-property.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-property .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-PROPERTY" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-PROPERTY" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-qgroup.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-qgroup.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-qgroup.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-qgroup.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-qgroup .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-QGROUP" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-QGROUP" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-quota.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-quota.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-quota.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-quota.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-quota .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-QUOTA" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-QUOTA" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-receive.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-receive.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-receive.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-receive.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-receive .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-RECEIVE" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-RECEIVE" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-replace.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-replace.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-replace.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-replace.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-replace .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-REPLACE" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-REPLACE" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-rescue.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-rescue.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-rescue.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-rescue.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-rescue .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-RESCUE" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-RESCUE" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-restore.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-restore.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-restore.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-restore.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-restore .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-RESTORE" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-RESTORE" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-scrub.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-scrub.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-scrub.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-scrub.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-scrub .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-SCRUB" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-SCRUB" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-select-super.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-select-super.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-select-super.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-select-super.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-select-super .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-SELECT\-SUPER" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-SELECT\-SUPER" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-send.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-send.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-send.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-send.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-send .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-SEND" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-SEND" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs-subvolume.8 new/btrfs-progs-v5.14.1/Documentation/btrfs-subvolume.8 --- old/btrfs-progs-v5.14/Documentation/btrfs-subvolume.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs-subvolume.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-subvolume .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-SUBVOLUME" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-SUBVOLUME" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs.5 new/btrfs-progs-v5.14.1/Documentation/btrfs.5 --- old/btrfs-progs-v5.14/Documentation/btrfs.5 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs.5 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs-man5 .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS\-MAN5" "5" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS\-MAN5" "5" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfs.8 new/btrfs-progs-v5.14.1/Documentation/btrfs.8 --- old/btrfs-progs-v5.14/Documentation/btrfs.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfs.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfs .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFS" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFS" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/btrfstune.8 new/btrfs-progs-v5.14.1/Documentation/btrfstune.8 --- old/btrfs-progs-v5.14/Documentation/btrfstune.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/btrfstune.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: btrfstune .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "BTRFSTUNE" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "BTRFSTUNE" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/fsck.btrfs.8 new/btrfs-progs-v5.14.1/Documentation/fsck.btrfs.8 --- old/btrfs-progs-v5.14/Documentation/fsck.btrfs.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/fsck.btrfs.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: fsck.btrfs .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "FSCK\&.BTRFS" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "FSCK\&.BTRFS" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/Documentation/mkfs.btrfs.8 new/btrfs-progs-v5.14.1/Documentation/mkfs.btrfs.8 --- old/btrfs-progs-v5.14/Documentation/mkfs.btrfs.8 2021-09-10 16:48:03.000000000 +0200 +++ new/btrfs-progs-v5.14.1/Documentation/mkfs.btrfs.8 2021-09-20 18:10:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: mkfs.btrfs .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/10/2021 +.\" Date: 09/20/2021 .\" Manual: Btrfs Manual -.\" Source: Btrfs v5.14 +.\" Source: Btrfs v5.14.1 .\" Language: English .\" -.TH "MKFS\&.BTRFS" "8" "09/10/2021" "Btrfs v5\&.14" "Btrfs Manual" +.TH "MKFS\&.BTRFS" "8" "09/20/2021" "Btrfs v5\&.14\&.1" "Btrfs Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/VERSION new/btrfs-progs-v5.14.1/VERSION --- old/btrfs-progs-v5.14/VERSION 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/VERSION 2021-09-20 18:09:16.000000000 +0200 @@ -1 +1 @@ -v5.14 +v5.14.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/check/main.c new/btrfs-progs-v5.14.1/check/main.c --- old/btrfs-progs-v5.14/check/main.c 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/check/main.c 2021-09-20 18:09:16.000000000 +0200 @@ -10384,7 +10384,8 @@ int qgroup_report = 0; int qgroups_repaired = 0; int qgroup_verify_ret; - unsigned ctree_flags = OPEN_CTREE_EXCLUSIVE; + unsigned ctree_flags = OPEN_CTREE_EXCLUSIVE | + OPEN_CTREE_ALLOW_TRANSID_MISMATCH; int force = 0; while(1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/cmds/filesystem.c new/btrfs-progs-v5.14.1/cmds/filesystem.c --- old/btrfs-progs-v5.14/cmds/filesystem.c 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/cmds/filesystem.c 2021-09-20 18:09:16.000000000 +0200 @@ -835,7 +835,7 @@ int ret; ret = parse_compress_type(s); - if (ret) { + if (ret < 0) { error("unknown compression type: %s", s); exit(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/cmds/restore.c new/btrfs-progs-v5.14.1/cmds/restore.c --- old/btrfs-progs-v5.14/cmds/restore.c 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/cmds/restore.c 2021-09-20 18:09:16.000000000 +0200 @@ -1213,7 +1213,8 @@ ocf.filename = dev; ocf.sb_bytenr = bytenr; ocf.root_tree_bytenr = root_location; - ocf.flags = OPEN_CTREE_PARTIAL | OPEN_CTREE_NO_BLOCK_GROUPS; + ocf.flags = OPEN_CTREE_PARTIAL | OPEN_CTREE_NO_BLOCK_GROUPS | + OPEN_CTREE_ALLOW_TRANSID_MISMATCH; fs_info = open_ctree_fs_info(&ocf); if (fs_info) break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/configure new/btrfs-progs-v5.14.1/configure --- old/btrfs-progs-v5.14/configure 2021-09-10 16:48:00.000000000 +0200 +++ new/btrfs-progs-v5.14.1/configure 2021-09-20 18:10:08.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for btrfs-progs v5.14 . +# Generated by GNU Autoconf 2.69 for btrfs-progs v5.14.1 . # # Report bugs to <linux-bt...@vger.kernel.org>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='btrfs-progs' PACKAGE_TARNAME='btrfs-progs' -PACKAGE_VERSION='v5.14 ' -PACKAGE_STRING='btrfs-progs v5.14 ' +PACKAGE_VERSION='v5.14.1 ' +PACKAGE_STRING='btrfs-progs v5.14.1 ' PACKAGE_BUGREPORT='linux-bt...@vger.kernel.org' PACKAGE_URL='http://btrfs.wiki.kernel.org' @@ -1352,7 +1352,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures btrfs-progs v5.14 to adapt to many kinds of systems. +\`configure' configures btrfs-progs v5.14.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1417,7 +1417,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of btrfs-progs v5.14 :";; + short | recursive ) echo "Configuration of btrfs-progs v5.14.1 :";; esac cat <<\_ACEOF @@ -1564,7 +1564,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -btrfs-progs configure v5.14 +btrfs-progs configure v5.14.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1990,7 +1990,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by btrfs-progs $as_me v5.14 , which was +It was created by btrfs-progs $as_me v5.14.1 , which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8017,7 +8017,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by btrfs-progs $as_me v5.14 , which was +This file was extended by btrfs-progs $as_me v5.14.1 , which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8080,7 +8080,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -btrfs-progs config.status v5.14 +btrfs-progs config.status v5.14.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/convert/common.c new/btrfs-progs-v5.14.1/convert/common.c --- old/btrfs-progs-v5.14/convert/common.c 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/convert/common.c 2021-09-20 18:09:16.000000000 +0200 @@ -104,11 +104,10 @@ ret = -EINVAL; goto out; } - if (!test_uuid_unique(cfg->fs_uuid)) { - error("non-unique UUID: %s", cfg->fs_uuid); - ret = -EINVAL; - goto out; - } + /* + * Caller should make sure the uuid is either unique or OK to + * be duplicate in case it's copied from the source filesystem. + */ uuid_copy(super->metadata_uuid, super->fsid); } else { uuid_generate(super->fsid); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/convert/main.c new/btrfs-progs-v5.14.1/convert/main.c --- old/btrfs-progs-v5.14/convert/main.c 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/convert/main.c 2021-09-20 18:09:16.000000000 +0200 @@ -1189,6 +1189,8 @@ if (convert_flags & CONVERT_FLAG_COPY_FSID) { uuid_unparse(cctx.fs_uuid, mkfs_cfg.fs_uuid); + if (!test_uuid_unique(mkfs_cfg.fs_uuid)) + warning("non-unique UUID (copy): %s", mkfs_cfg.fs_uuid); } else if (fsid[0] == 0) { uuid_t uuid; @@ -1196,6 +1198,8 @@ uuid_unparse(uuid, mkfs_cfg.fs_uuid); } else { memcpy(mkfs_cfg.fs_uuid, fsid, BTRFS_UUID_UNPARSED_SIZE); + if (!test_uuid_unique(mkfs_cfg.fs_uuid)) + warning("non-unique UUID (user set): %s", mkfs_cfg.fs_uuid); } printf("Source filesystem:\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/image/main.c new/btrfs-progs-v5.14.1/image/main.c --- old/btrfs-progs-v5.14/image/main.c 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/image/main.c 2021-09-20 18:09:16.000000000 +0200 @@ -1004,7 +1004,7 @@ int ret; int err = 0; - root = open_ctree(input, 0, 0); + root = open_ctree(input, 0, OPEN_CTREE_ALLOW_TRANSID_MISMATCH); if (!root) { error("open ctree failed"); return -EIO; @@ -2781,7 +2781,8 @@ struct open_ctree_flags ocf = { 0 }; ocf.filename = target; - ocf.flags = OPEN_CTREE_WRITES | OPEN_CTREE_RESTORE | OPEN_CTREE_PARTIAL; + ocf.flags = OPEN_CTREE_WRITES | OPEN_CTREE_RESTORE | + OPEN_CTREE_PARTIAL; info = open_ctree_fs_info(&ocf); if (!info) { error("open ctree failed"); @@ -2846,7 +2847,8 @@ root = open_ctree_fd(fileno(out), target, 0, OPEN_CTREE_PARTIAL | OPEN_CTREE_WRITES | - OPEN_CTREE_NO_DEVICES); + OPEN_CTREE_NO_DEVICES | + OPEN_CTREE_ALLOW_TRANSID_MISMATCH); if (!root) { error("open ctree failed in %s", target); ret = -EIO; @@ -2864,7 +2866,8 @@ u64 dev_size; if (!info) { - root = open_ctree_fd(fileno(out), target, 0, 0); + root = open_ctree_fd(fileno(out), target, 0, + OPEN_CTREE_ALLOW_TRANSID_MISMATCH); if (!root) { error("open ctree failed in %s", target); ret = -EIO; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/kernel-shared/ctree.h new/btrfs-progs-v5.14.1/kernel-shared/ctree.h --- old/btrfs-progs-v5.14/kernel-shared/ctree.h 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/kernel-shared/ctree.h 2021-09-20 18:09:16.000000000 +0200 @@ -1216,6 +1216,7 @@ unsigned int avoid_sys_chunk_alloc:1; unsigned int finalize_on_close:1; unsigned int hide_names:1; + unsigned int allow_transid_mismatch:1; int transaction_aborted; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/kernel-shared/disk-io.c new/btrfs-progs-v5.14.1/kernel-shared/disk-io.c --- old/btrfs-progs-v5.14/kernel-shared/disk-io.c 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/kernel-shared/disk-io.c 2021-09-20 18:09:16.000000000 +0200 @@ -421,7 +421,7 @@ ret = -EIO; break; } - if (num_copies == 1) { + if (num_copies == 1 && fs_info->allow_transid_mismatch) { ignore = 1; continue; } @@ -431,6 +431,10 @@ } mirror_num++; if (mirror_num > num_copies) { + if (!fs_info->allow_transid_mismatch) { + ret = -EIO; + break; + } if (candidate_mirror > 0) mirror_num = candidate_mirror; else @@ -1231,6 +1235,8 @@ fs_info->ignore_chunk_tree_error = 1; if (flags & OPEN_CTREE_HIDE_NAMES) fs_info->hide_names = 1; + if (flags & OPEN_CTREE_ALLOW_TRANSID_MISMATCH) + fs_info->allow_transid_mismatch = 1; if ((flags & OPEN_CTREE_RECOVER_SUPER) && (flags & OPEN_CTREE_TEMPORARY_SUPER)) { @@ -1988,7 +1994,8 @@ return ret; ret = verify_parent_transid(&buf->fs_info->extent_cache, buf, - parent_transid, 1); + parent_transid, + buf->fs_info->allow_transid_mismatch); return !ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/kernel-shared/disk-io.h new/btrfs-progs-v5.14.1/kernel-shared/disk-io.h --- old/btrfs-progs-v5.14/kernel-shared/disk-io.h 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/kernel-shared/disk-io.h 2021-09-20 18:09:16.000000000 +0200 @@ -88,6 +88,12 @@ /* For print-tree, print HIDDEN instead of filenames/xattrs/refs */ OPEN_CTREE_HIDE_NAMES = (1U << 14), + + /* + * Allow certain commands like check/restore to ignore transid + * mismatch. + */ + OPEN_CTREE_ALLOW_TRANSID_MISMATCH = (1U << 15), }; /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/kernel-shared/zoned.c new/btrfs-progs-v5.14.1/kernel-shared/zoned.c --- old/btrfs-progs-v5.14/kernel-shared/zoned.c 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/kernel-shared/zoned.c 2021-09-20 18:09:16.000000000 +0200 @@ -504,8 +504,14 @@ if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) { ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector); if (ret < 0) { - if (errno == ENOTTY) { - /* No kernel support, assuming non-zoned device */ + if (errno == ENOTTY || errno == EINVAL) { + /* + * No kernel support, assuming non-zoned device. + * + * Note: older kernels before 5.11 could return + * EINVAL in case the ioctl is not available, + * which is wrong. + */ zone_size_sector = 0; } else { error("zoned: ioctl BLKGETZONESZ failed: %m"); @@ -548,7 +554,11 @@ ret = ioctl(fd, BLKREPORTZONE, rep); if (ret) { - if (errno == ENOTTY) { + if (errno == ENOTTY || errno == EINVAL) { + /* + * Note: older kernels before 5.11 could return EINVAL + * in case the ioctl is not available, which is wrong. + */ error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m"); exit(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/tests/cli-tests/015-defrag-compress/test.sh new/btrfs-progs-v5.14.1/tests/cli-tests/015-defrag-compress/test.sh --- old/btrfs-progs-v5.14/tests/cli-tests/015-defrag-compress/test.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/btrfs-progs-v5.14.1/tests/cli-tests/015-defrag-compress/test.sh 2021-09-20 18:09:16.000000000 +0200 @@ -0,0 +1,16 @@ +#!/bin/bash +# Test parsing of option 'defrag -c' + +source "$TEST_TOP/common" + +setup_root_helper +prepare_test_dev + +run_check_mkfs_test_dev +run_check_mount_test_dev +run_check $SUDO_HELPER dd if=/dev/zero of="$TEST_MNT"/file bs=1M count=1 +run_check $SUDO_HELPER "$TOP/btrfs" filesystem defrag -v -c "$TEST_MNT/file" +run_check $SUDO_HELPER "$TOP/btrfs" filesystem defrag -v -clzo "$TEST_MNT/file" +run_check $SUDO_HELPER "$TOP/btrfs" filesystem defrag -v -czlib "$TEST_MNT/file" +run_check $SUDO_HELPER "$TOP/btrfs" filesystem defrag -v -czstd "$TEST_MNT/file" +run_check_umount_test_dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/tests/convert-tests/021-uuid-fsid/test.sh new/btrfs-progs-v5.14.1/tests/convert-tests/021-uuid-fsid/test.sh --- old/btrfs-progs-v5.14/tests/convert-tests/021-uuid-fsid/test.sh 2021-09-10 16:47:28.000000000 +0200 +++ new/btrfs-progs-v5.14.1/tests/convert-tests/021-uuid-fsid/test.sh 2021-09-20 18:09:16.000000000 +0200 @@ -5,9 +5,12 @@ source "$TEST_TOP/common.convert" setup_root_helper -prepare_test_dev check_prereq btrfs-convert check_global_prereq mke2fs +setup_loopdevs 1 +prepare_loopdevs +# Convert helpers need the backing file, can't pass ${loopdevs[1]} +TEST_DEV=${loopdev_prefix}1 convert_test_prep_fs ext4 mke2fs -t ext4 -b 4096 run_check_umount_test_dev @@ -55,3 +58,5 @@ run_mustfail "invalid UUID passed" \ "$TOP/btrfs-convert" --uuid invalid "$TEST_DEV" + +cleanup_loopdevs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/tests/misc-tests/049-btrfstune-transid-mismatch/default_case.img new/btrfs-progs-v5.14.1/tests/misc-tests/049-btrfstune-transid-mismatch/default_case.img --- old/btrfs-progs-v5.14/tests/misc-tests/049-btrfstune-transid-mismatch/default_case.img 1970-01-01 01:00:00.000000000 +0100 +++ new/btrfs-progs-v5.14.1/tests/misc-tests/049-btrfstune-transid-mismatch/default_case.img 2021-10-05 22:33:46.678861562 +0200 @@ -0,0 +1 @@ +symbolic link to ../../fsck-tests/002-bad-transid/default_case.img diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v5.14/tests/misc-tests/049-btrfstune-transid-mismatch/test.sh new/btrfs-progs-v5.14.1/tests/misc-tests/049-btrfstune-transid-mismatch/test.sh --- old/btrfs-progs-v5.14/tests/misc-tests/049-btrfstune-transid-mismatch/test.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/btrfs-progs-v5.14.1/tests/misc-tests/049-btrfstune-transid-mismatch/test.sh 2021-09-20 18:09:16.000000000 +0200 @@ -0,0 +1,16 @@ +#!/bin/bash +# Verify that btrfstune would reject fs with transid mismatch problems + +source "$TEST_TOP/common" + +check_prereq btrfs-image +check_prereq btrfs +check_prereq btrfstune + +# Although we're not checking the image, here we just reuse the infrastructure +check_image() { + run_mustfail "btrfstune should fail when the image has transid error" \ + "$TOP/btrfstune" -u "$1" +} + +check_all_images
