Package: btrfs-tools
Version: 0.19+20130705-3
Severity: wishlist
Tags: patch
Hello,
See announcement at http://thread.gmane.org/gmane.comp.file-systems.btrfs/30403
The attached patch updates Debian package to this new version 3.12
I think it is complete and it closes 2 bugs: #719072 & #732075
Regards,
Julien
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (900, 'unstable'), (400, 'testing'), (300, 'experimental'), (200,
'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.12.5+ (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages btrfs-tools depends on:
ii e2fslibs 1.42.8-1
ii libblkid1 2.20.1-5.3
ii libc6 2.17-97
ii libcomerr2 1.42.8-1
ii liblzo2-2 2.06-1
ii libuuid1 2.20.1-5.3
ii zlib1g 1:1.2.8.dfsg-1
btrfs-tools recommends no packages.
btrfs-tools suggests no packages.
-- no debconf information
diff --git a/debian/changelog b/debian/changelog
index 8c6a5d6..a5c17e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+btrfs-tools (3.12-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #732075)
+ * Drop patches merged upstream:
+ - 07-manpage2.patch
+ - 10-soname.patch
+ - Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
+ * Refresh patches. (Closes: #719072)
+
+ -- Julien Muchembled <j...@jmuchemb.eu> Wed, 18 Dec 2013 11:51:13 +0100
+
btrfs-tools (0.19+20130705-3) unstable; urgency=low
* Import patch by Shilong Wang to resolve btrfs-convert (Closes:
diff --git a/debian/patches/02-ftbfs.patch b/debian/patches/02-ftbfs.patch
index 3b188b8..e52052d 100644
--- a/debian/patches/02-ftbfs.patch
+++ b/debian/patches/02-ftbfs.patch
@@ -8,7 +8,7 @@ Description:
--- a/btrfs-convert.c
+++ b/btrfs-convert.c
-@@ -2520,7 +2520,7 @@
+@@ -2444,7 +2444,7 @@ static int do_rollback(const char *devname, int force)
ext2_root = btrfs_read_fs_root(root->fs_info, &key);
if (!ext2_root || IS_ERR(ext2_root)) {
fprintf(stderr, "unable to open subvol %llu\n",
diff --git a/debian/patches/03-manpage.patch b/debian/patches/03-manpage.patch
index d8c1b25..e0983e3 100644
--- a/debian/patches/03-manpage.patch
+++ b/debian/patches/03-manpage.patch
@@ -5,7 +5,7 @@ Description:
--- a/man/btrfs.8.in
+++ b/man/btrfs.8.in
-@@ -497,7 +497,7 @@
+@@ -752,7 +752,7 @@ case of failure.
.SH AVAILABILITY
.B btrfs
@@ -14,20 +14,9 @@ Description:
and not suitable for any uses other than benchmarking and review.
Please refer to the btrfs wiki http://btrfs.wiki.kernel.org for
further details.
---- a/man/btrfsck.8.in
-+++ b/man/btrfsck.8.in
-@@ -8,7 +8,7 @@
- \fIdevice\fP is the device file where the filesystem is stored.
- .SH AVAILABILITY
- .B btrfsck
--is part of btrfs-progs. Btrfs is currently under heavy development,
-+is part of btrfs-tools. Btrfs is currently under heavy development,
- and not suitable for any uses other than benchmarking and review.
- Please refer to the btrfs wiki http://btrfs.wiki.kernel.org for
- further details.
--- a/man/btrfs-image.8.in
+++ b/man/btrfs-image.8.in
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ option if your extent tree is corrupted to make sure that all of the metadata is
captured.
.SH AVAILABILITY
.B btrfs-image
@@ -38,7 +27,7 @@ Description:
http://btrfs.wiki.kernel.org for further details.
--- a/man/mkfs.btrfs.8.in
+++ b/man/mkfs.btrfs.8.in
-@@ -84,7 +84,7 @@
+@@ -97,7 +97,7 @@ As default the unit is the byte, however it is possible to append a suffix
to the arguments like \fBk\fP for KBytes, \fBm\fP for MBytes...
.SH AVAILABILITY
.B mkfs.btrfs
diff --git a/debian/patches/04-linker.patch b/debian/patches/04-linker.patch
index b3dc028..479402f 100644
--- a/debian/patches/04-linker.patch
+++ b/debian/patches/04-linker.patch
@@ -3,7 +3,7 @@ Description: Fixes FTBFS with --no-add-needed (Closes: #554059).
--- a/Makefile
+++ b/Makefile
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@ TESTS = fsck-tests.sh
INSTALL = install
prefix ?= /usr/local
bindir = $(prefix)/bin
diff --git a/debian/patches/07-manpage2.patch b/debian/patches/07-manpage2.patch
deleted file mode 100644
index 5c876bf..0000000
--- a/debian/patches/07-manpage2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Daniel Baumann <daniel.baum...@progress-technologies.net>
-Description: Update manpage to match /sbin/btrfs (Closes: #638778, #642302).
-
---- a/man/btrfs.8.in
-+++ b/man/btrfs.8.in
-@@ -25,6 +25,8 @@
- [-s \fIstart\fR] [-t \fIsize\fR] -[vf] <\fIfile\fR>|<\fIdir\fR> \
- [<\fIfile\fR>|<\fIdir\fR>...]
- .PP
-+\fBbtrfs\fP \fBfilesystem df\fP\fI <path> \fP
-+.PP
- \fBbtrfs\fP \fBfilesystem sync\fP\fI <path> \fP
- .PP
- \fBbtrfs\fP \fBfilesystem resize\fP\fI [devid:][+/\-]<size>[gkm]|[devid:]max <filesystem>\fP
-@@ -33,7 +35,7 @@
- .PP
- \fBbtrfs\fP \fBfilesystem balance\fP\fI <path> \fP
- .PP
--\fBbtrfs\fP \fBdevice scan\fP\fI [--all-devices|<device> [<device>...]]\fP
-+\fBbtrfs\fP \fBfilesystem scan\fP\fI [--all-devices|<device> [<device>...]]\fP
- .PP
- \fBbtrfs\fP \fBdevice stats\fP [-z] {\fI<path>\fP|\fI<device>\fP}
- .PP
-@@ -199,6 +201,10 @@
- Show information of a given subvolume in the \fI<path>\fR.
- .TP
-
-+\fBfilesystem df\fR\fI <path>\fR
-+Resize a filesystem identified by \fI<path>\fR.
-+.TP
-+
- \fBfilesystem defragment\fP -c[zlib|lzo] [-l \fIlen\fR] [-s \fIstart\fR] \
- [-t \fIsize\fR] -[vf] <\fIfile\fR>|<\fIdir\fR> [<\fIfile\fR>|<\fIdir\fR>...]
-
diff --git a/debian/patches/09-unaligned-memaccess.patch b/debian/patches/09-unaligned-memaccess.patch
index c6b9fba..68debf8 100644
--- a/debian/patches/09-unaligned-memaccess.patch
+++ b/debian/patches/09-unaligned-memaccess.patch
@@ -12,7 +12,7 @@ Description: Fixing unaligned memory accesses (Closes: #656955).
#if BTRFS_FLAT_INCLUDES
#include "list.h"
#include "kerncompat.h"
-@@ -1135,13 +1137,17 @@
+@@ -1171,13 +1173,17 @@ struct btrfs_root {
static inline u##bits btrfs_##name(struct extent_buffer *eb) \
{ \
struct btrfs_header *h = (struct btrfs_header *)eb->data; \
@@ -32,7 +32,7 @@ Description: Fixing unaligned memory accesses (Closes: #656955).
}
#define BTRFS_SETGET_FUNCS(name, type, member, bits) \
-@@ -1163,11 +1169,15 @@
+@@ -1199,11 +1205,15 @@ static inline void btrfs_set_##name(struct extent_buffer *eb, \
#define BTRFS_SETGET_STACK_FUNCS(name, type, member, bits) \
static inline u##bits btrfs_##name(type *s) \
{ \
@@ -52,7 +52,7 @@ Description: Fixing unaligned memory accesses (Closes: #656955).
BTRFS_SETGET_FUNCS(device_type, struct btrfs_dev_item, type, 64);
--- a/volumes.c
+++ b/volumes.c
-@@ -452,10 +452,11 @@
+@@ -458,10 +458,11 @@ static int find_next_chunk(struct btrfs_root *root, u64 objectid, u64 *offset)
if (found_key.objectid != objectid)
*offset = 0;
else {
diff --git a/debian/patches/10-soname.patch b/debian/patches/10-soname.patch
deleted file mode 100644
index 39bfe31..0000000
--- a/debian/patches/10-soname.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Luk Claes <l...@debian.org>
-Description: Setting soname for libbtrfs.
-
---- a/Makefile
-+++ b/Makefile
-@@ -100,7 +100,7 @@
- $(libs_shared): $(libbtrfs_objects) $(lib_links) send.h
- @echo " [LD] $@"
- $(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(LDFLAGS) $(lib_LIBS) \
-- -shared -Wl,-soname,libbtrfs.so -o libbtrfs.so.0.1
-+ -shared -Wl,-soname,libbtrfs.so.0 -o libbtrfs.so.0.1
-
- $(libs_static): $(libbtrfs_objects)
- @echo " [AR] $@"
diff --git a/debian/patches/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch b/debian/patches/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
deleted file mode 100644
index 7158695..0000000
--- a/debian/patches/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From patchwork Wed Jul 17 16:03:40 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: Btrfs-progs: fix wrong arg sb_bytenr for btrfs_scan_fs_devices()
-From: Shilong Wang <wangshilong1...@gmail.com>
-X-Patchwork-Id: 2828820
-Message-Id: <1374077020-21354-1-git-send-email-wangshilong1...@gmail.com>
-To: linux-bt...@vger.kernel.org
-Cc: wangsl.f...@cn.fujitsu.com
-Date: Thu, 18 Jul 2013 00:03:40 +0800
-
-From: Wang Shilong <wangsl.f...@cn.fujitsu.com>
-
-For most time, In open_ctree_*(), we use the first superblock
-(BTRFS_SUPER_INFO_OFFSET). However, for btrfs-convert, we don't,
-we should pass the correct sb_bytenr to btrfs_scan_fs_devices() rather
-than always use BTRFS_SUPER_INFO_OFFSET.This patch fix the following
-regression:
-
-mkfs.ext2 <dev>
-btrfs-convert <dev>
-
-warning, device 1 is missing
-Check tree block failed, want=2670592, have=0
-read block failed check_tree_block
-Couldn't read chunk root
-Segmentation fault (core dumped)
-
-Signed-off-by: Wang Shilong <wangsl.f...@cn.fujitsu.com>
-
----
-btrfs-find-root.c | 2 +-
- cmds-chunk.c | 2 +-
- disk-io.c | 9 ++++++---
- disk-io.h | 2 +-
- 4 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/btrfs-find-root.c b/btrfs-find-root.c
-index 9b3d7df..374cf81 100644
---- a/btrfs-find-root.c
-+++ b/btrfs-find-root.c
-@@ -82,7 +82,7 @@ static struct btrfs_root *open_ctree_broken(int fd, const char *device)
- return NULL;
- }
-
-- ret = btrfs_scan_fs_devices(fd, device, &fs_devices);
-+ ret = btrfs_scan_fs_devices(fd, device, &fs_devices, 0);
- if (ret)
- goto out;
-
-diff --git a/cmds-chunk.c b/cmds-chunk.c
-index 03314de..6ada328 100644
---- a/cmds-chunk.c
-+++ b/cmds-chunk.c
-@@ -1291,7 +1291,7 @@ static int recover_prepare(struct recover_control *rc, char *path)
- goto fail_free_sb;
- }
-
-- ret = btrfs_scan_fs_devices(fd, path, &fs_devices);
-+ ret = btrfs_scan_fs_devices(fd, path, &fs_devices, 0);
- if (ret)
- goto fail_free_sb;
-
-diff --git a/disk-io.c b/disk-io.c
-index 13dbe27..f8e236c 100644
---- a/disk-io.c
-+++ b/disk-io.c
-@@ -909,13 +909,16 @@ void btrfs_cleanup_all_caches(struct btrfs_fs_info *fs_info)
- }
-
- int btrfs_scan_fs_devices(int fd, const char *path,
-- struct btrfs_fs_devices **fs_devices)
-+ struct btrfs_fs_devices **fs_devices,
-+ u64 sb_bytenr)
- {
- u64 total_devs;
- int ret;
-+ if (!sb_bytenr)
-+ sb_bytenr = BTRFS_SUPER_INFO_OFFSET;
-
- ret = btrfs_scan_one_device(fd, path, fs_devices,
-- &total_devs, BTRFS_SUPER_INFO_OFFSET);
-+ &total_devs, sb_bytenr);
- if (ret) {
- fprintf(stderr, "No valid Btrfs found on %s\n", path);
- return ret;
-@@ -1001,7 +1004,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
- if (restore)
- fs_info->on_restoring = 1;
-
-- ret = btrfs_scan_fs_devices(fp, path, &fs_devices);
-+ ret = btrfs_scan_fs_devices(fp, path, &fs_devices, sb_bytenr);
- if (ret)
- goto out;
-
-diff --git a/disk-io.h b/disk-io.h
-index effaa9f..bc749c3 100644
---- a/disk-io.h
-+++ b/disk-io.h
-@@ -59,7 +59,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info,
- void btrfs_release_all_roots(struct btrfs_fs_info *fs_info);
- void btrfs_cleanup_all_caches(struct btrfs_fs_info *fs_info);
- int btrfs_scan_fs_devices(int fd, const char *path,
-- struct btrfs_fs_devices **fs_devices);
-+ struct btrfs_fs_devices **fs_devices, u64 sb_bytenr);
- int btrfs_setup_chunk_tree_and_device_map(struct btrfs_fs_info *fs_info);
-
- struct btrfs_root *open_ctree(const char *filename, u64 sb_bytenr, int writes);
diff --git a/debian/patches/series b/debian/patches/series
index 3d158af..ae346fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
02-ftbfs.patch
03-manpage.patch
04-linker.patch
-07-manpage2.patch
09-unaligned-memaccess.patch
-10-soname.patch
default-to-fsck.patch
-Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
