From 7d9af21f71caa35fe3a0028e7b4b4c648c95ed8802f438ed6dfada9cd2bdd3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 8 Sep 2013 09:30:02 +0000 Subject: [PATCH] Accepting request 197508 from home:dsterba:branches:filesystems SR: urgent fix, breaks installation on factory (ImageMagick package) - btrfs-progs-mkfs-default-extref.diff: turn on extended refs by default, (aka hardlink count limtitation) (bnc#835695) OBS-URL: https://build.opensuse.org/request/show/197508 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=138 --- btrfs-progs-mkfs-default-extref.diff | 13 +++++++++++++ btrfsprogs.changes | 6 ++++++ btrfsprogs.spec | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 btrfs-progs-mkfs-default-extref.diff diff --git a/btrfs-progs-mkfs-default-extref.diff b/btrfs-progs-mkfs-default-extref.diff new file mode 100644 index 0000000..60f6c3e --- /dev/null +++ b/btrfs-progs-mkfs-default-extref.diff @@ -0,0 +1,13 @@ +Index: btrfs-progs-v0.20-rc1-335-gf00dd83/mkfs.c +=================================================================== +--- btrfs-progs-v0.20-rc1-335-gf00dd83.orig/mkfs.c ++++ btrfs-progs-v0.20-rc1-335-gf00dd83/mkfs.c +@@ -1520,6 +1520,8 @@ raid_groups: + + super = root->fs_info->super_copy; + flags = btrfs_super_incompat_flags(super); ++ printf("Turning on extended refs (higher hardlink limit)\n"); ++ flags |= BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF; + + if (mixed) + flags |= BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS; diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 61c7696..06ac095 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 5 16:33:50 CEST 2013 - dsterba@suse.cz + +- btrfs-progs-mkfs-default-extref.diff: turn on extended refs by + default, (aka hardlink count limtitation) (bnc#835695) + ------------------------------------------------------------------- Fri Aug 9 14:03:04 CEST 2013 - dsterba@suse.cz diff --git a/btrfsprogs.spec b/btrfsprogs.spec index f8e7d62..e0e2a65 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -35,6 +35,7 @@ Source3: 80-btrfs.rules Patch10: 0010-Btrfs-progs-make-btrfsck-a-hardlink-at-install-time.patch Patch12: 0012-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch Patch40: 0040-btrfs-progs-fix-loop-device-mount-checks.patch +Patch1: btrfs-progs-mkfs-default-extref.diff Patch1000: local-version-override.patch Patch1001: btrfs-progs-use-IEEE1541-suffixes-for-sizes.patch Patch1002: btrfs-progs-add-man-page-for-btrfs-convert.patch @@ -77,6 +78,7 @@ build applications to interface with btrfs. %patch10 -p1 %patch12 -p1 %patch40 -p1 +%patch1 -p1 %patch1000 -p1 %patch1001 -p1 %patch1002 -p1