Accepting request 290341 from home:dsterba:branches:filesystems
version update OBS-URL: https://build.opensuse.org/request/show/290341 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=192
This commit is contained in:
David Sterba
Git OBS Bridge
parent
d76ad0aad8
commit
1e605498e8
@ -1,53 +0,0 @@
|
||||
From 4469ed43b26b6e7d5ad5cfea45e99708e39de4a6 Mon Sep 17 00:00:00 2001
|
||||
From: David Marcin <djmarcin@google.com>
|
||||
Date: Wed, 16 Nov 2011 12:18:08 -0800
|
||||
Subject: [PATCH 169/170] btrfs-progs: Check metadata mirrors in find-root.
|
||||
|
||||
Signed-off-by: David Marcin <djmarcin@google.com>
|
||||
---
|
||||
btrfs-find-root.c | 13 ++++++++++++-
|
||||
1 file changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: btrfs-progs-v3.14/btrfs-find-root.c
|
||||
===================================================================
|
||||
--- btrfs-progs-v3.14.orig/btrfs-find-root.c
|
||||
+++ btrfs-progs-v3.14/btrfs-find-root.c
|
||||
@@ -230,6 +230,8 @@ static int find_root(struct btrfs_root *
|
||||
while (1) {
|
||||
u64 map_length = 4096;
|
||||
u64 type;
|
||||
+ int mirror_num;
|
||||
+ int num_copies;
|
||||
|
||||
if (offset >
|
||||
btrfs_super_total_bytes(root->fs_info->super_copy)) {
|
||||
@@ -246,9 +248,11 @@ static int find_root(struct btrfs_root *
|
||||
}
|
||||
offset = metadata_offset;
|
||||
}
|
||||
+ mirror_num = 1;
|
||||
+ again:
|
||||
err = __btrfs_map_block(&root->fs_info->mapping_tree, READ,
|
||||
offset, &map_length, &type,
|
||||
- &multi, 0, NULL);
|
||||
+ &multi, mirror_num, NULL);
|
||||
if (err) {
|
||||
offset += map_length;
|
||||
continue;
|
||||
@@ -267,9 +271,16 @@ static int find_root(struct btrfs_root *
|
||||
|
||||
err = read_physical(root, fd, offset, bytenr, map_length);
|
||||
if (!err) {
|
||||
+ /* Found the root. */
|
||||
ret = 0;
|
||||
break;
|
||||
} else if (err < 0) {
|
||||
+ num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
|
||||
+ offset, map_length);
|
||||
+ mirror_num++;
|
||||
+ if (mirror_num <= num_copies)
|
||||
+ goto again;
|
||||
+ /* Unrecoverable error in read. */
|
||||
ret = err;
|
||||
break;
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bd666e9c3240a98de655aad6291660b963fe4bbd36916978fd0d66c5a4af9ab5
|
||||
size 1241438
|
||||
3
btrfs-progs-v3.19.tar.gz
Normal file
3
btrfs-progs-v3.19.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:63b0f2f14888bcece26bca33d33da5e38b716b37df1bdfe7ba9077cb152bf866
|
||||
size 1332550
|
||||
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 11 00:00:00 CET 2015 - dsterba@suse.cz
|
||||
|
||||
- version 3.19
|
||||
- btrfs-image
|
||||
- restore can now run in parallel threads
|
||||
- fixed restore of multiple image from multiple devices onto a single dev
|
||||
- introduced metadump v2
|
||||
- check
|
||||
- make --init-csum-tree and --init-extent-tree work together
|
||||
- find-new
|
||||
- option to search through all metadata even if a root was already found
|
||||
- convert
|
||||
- show progress by default, can be turned off
|
||||
- corrupt-block
|
||||
- option to work on a specific root
|
||||
- bash completion script for all subcommands
|
||||
- spec: convert to autotools
|
||||
Removed patch 0169-btrfs-progs-Check-metadata-mirrors-in-find-root.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 2 00:00:00 CET 2015 - dsterba@suse.cz
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: btrfsprogs
|
||||
Version: 3.18.2
|
||||
Version: 3.19
|
||||
Release: 0
|
||||
Summary: Utilities for the Btrfs filesystem
|
||||
License: GPL-2.0
|
||||
@ -33,18 +33,20 @@ Source4: setup-btrfs.sh
|
||||
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
|
||||
Patch169: 0169-btrfs-progs-Check-metadata-mirrors-in-find-root.patch
|
||||
|
||||
Patch1000: local-version-override.patch
|
||||
Patch1001: fix-doc-build-on-SLE11SP3.diff
|
||||
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libacl-devel
|
||||
BuildRequires: libattr-devel
|
||||
BuildRequires: libblkid-devel
|
||||
BuildRequires: libext2fs-devel
|
||||
BuildRequires: libuuid-devel
|
||||
BuildRequires: lzo-devel
|
||||
BuildRequires: pkg-config
|
||||
%if 0%{?suse_version} >= 1310
|
||||
BuildRequires: suse-module-tools
|
||||
%endif
|
||||
@ -80,13 +82,13 @@ build applications to interface with btrfs.
|
||||
%patch163 -p1
|
||||
%patch167 -p1
|
||||
%patch168 -p1
|
||||
%patch169 -p1
|
||||
%patch1000 -p1
|
||||
%patch1001 -p1
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} CFLAGS="%{optflags}" all btrfs-convert \
|
||||
btrfs-zero-log btrfs-select-super btrfs-image btrfstune
|
||||
./autogen.sh
|
||||
%configure
|
||||
make V=1 %{?_smp_mflags} all
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_sbindir} mandir=%{_mandir} libdir=%{_libdir}
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
Index: btrfs-progs-v3.16.1/version.sh
|
||||
Index: btrfs-progs-v3.19/version.sh
|
||||
===================================================================
|
||||
--- btrfs-progs-v3.16.1.orig/version.sh
|
||||
+++ btrfs-progs-v3.16.1/version.sh
|
||||
--- btrfs-progs-v3.19.orig/version.sh
|
||||
+++ btrfs-progs-v3.19/version.sh
|
||||
@@ -6,7 +6,7 @@
|
||||
# Copyright 2008, Oracle
|
||||
# Released under the GNU GPLv2
|
||||
|
||||
-v="v3.18.2"
|
||||
+v="v3.18.2+20150129"
|
||||
-v="v3.19"
|
||||
+v="v3.19+20150311"
|
||||
|
||||
opt=$1
|
||||
|
||||
lib_major=0
|
||||
lib_minor=1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user