Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2015-12-01 09:18:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old) and /work/SRC/openSUSE:Factory/.btrfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btrfsprogs" Changes: -------- --- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2015-11-18 22:33:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes 2015-12-01 09:18:26.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 24 00:00:00 CET 2015 - [email protected] + +- fix mkfs failure on ppc64 (or with sectorsize > 4k) (bsc#956819) +- Added patch: 0001-btrfs-progs-mkfs-use-correct-size-for-superblock-csu.patch + +------------------------------------------------------------------- New: ---- 0001-btrfs-progs-mkfs-use-correct-size-for-superblock-csu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.Vqk3j4/_old 2015-12-01 09:18:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Vqk3j4/_new 2015-12-01 09:18:27.000000000 +0100 @@ -37,6 +37,8 @@ Source1: boot-btrfs.sh Source4: setup-btrfs.sh +Patch1: 0001-btrfs-progs-mkfs-use-correct-size-for-superblock-csu.patch + Patch163: 0163-btrfs-progs-fsck-fix-segfault.patch Patch167: 0167-Btrfs-progs-make-find_and_setup_root-return-an-error.patch Patch168: 0168-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch @@ -106,6 +108,7 @@ %prep %setup -q -n btrfs-progs-v%{version} +%patch1 -p1 %patch163 -p1 %patch167 -p1 %patch168 -p1 ++++++ 0001-btrfs-progs-mkfs-use-correct-size-for-superblock-csu.patch ++++++ >From bf1ac8305ab3f191d9345793b88c4f5ec691cb9b Mon Sep 17 00:00:00 2001 From: David Sterba <[email protected]> Date: Thu, 19 Nov 2015 15:55:05 +0100 Subject: [PATCH] btrfs-progs: mkfs: use correct size for superblock csum and writeout If sectorsize is not BTRFS_SUPER_INFO_SIZE (4k), the superblock checksum is wrong and mkfs fails. This has been reported on ppc64 where we pick sectorisize from page size (64k). This has been broken since ages (2008) and discovered by the recently added superblock checks. Reported-by: Dinar Valeev <[email protected]> Signed-off-by: David Sterba <[email protected]> --- utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils.c b/utils.c index 60235d84889c..13835051a1a5 100644 --- a/utils.c +++ b/utils.c @@ -552,12 +552,12 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg) /* and write out the super block */ BUG_ON(sizeof(super) > cfg->sectorsize); - memset(buf->data, 0, cfg->sectorsize); + memset(buf->data, 0, BTRFS_SUPER_INFO_SIZE); memcpy(buf->data, &super, sizeof(super)); - buf->len = cfg->sectorsize; + buf->len = BTRFS_SUPER_INFO_SIZE; csum_tree_block_size(buf, BTRFS_CRC32_SIZE, 0); - ret = pwrite(fd, buf->data, cfg->sectorsize, cfg->blocks[0]); - if (ret != cfg->sectorsize) { + ret = pwrite(fd, buf->data, BTRFS_SUPER_INFO_SIZE, cfg->blocks[0]); + if (ret != BTRFS_SUPER_INFO_SIZE) { ret = (ret < 0 ? -errno : -EIO); goto out; } -- 2.6.2 ++++++ local-version-override.patch ++++++ --- /var/tmp/diff_new_pack.Vqk3j4/_old 2015-12-01 09:18:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Vqk3j4/_new 2015-12-01 09:18:27.000000000 +0100 @@ -7,7 +7,7 @@ # Released under the GNU GPLv2 -v="v4.3.1" -+v="v4.3+20151116" ++v="v4.3.1+20151124" opt=$1
