Accepting request 344208 from home:dsterba:branches:filesystems
- update to 4.3 OBS-URL: https://build.opensuse.org/request/show/344208 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=220
This commit is contained in:
David Sterba
Git OBS Bridge
parent
994db06da7
commit
4d58d97cc8
@ -1,10 +1,10 @@
|
||||
diff --git a/Documentation/btrfs-balance.asciidoc b/Documentation/btrfs-balance.asciidoc
|
||||
index 6d2fd0c36086..12c2a2dc9fbd 100644
|
||||
--- a/Documentation/btrfs-balance.asciidoc
|
||||
+++ b/Documentation/btrfs-balance.asciidoc
|
||||
@@ -45,6 +45,12 @@ If filter list is not given balance all chunks of that type.
|
||||
In case none of the -d, -m or -s options is
|
||||
given balance all chunks in a filesystem.
|
||||
Index: btrfs-progs-v4.3/Documentation/btrfs-balance.asciidoc
|
||||
===================================================================
|
||||
--- btrfs-progs-v4.3.orig/Documentation/btrfs-balance.asciidoc
|
||||
+++ btrfs-progs-v4.3/Documentation/btrfs-balance.asciidoc
|
||||
@@ -67,6 +67,12 @@ resume interrupted balance
|
||||
start the balance operation according to the specified filters, no filters
|
||||
will rewrite the entire filesystem. The process runs in the foreground.
|
||||
+
|
||||
+NOTE: the balance command without filters will basically rewrite everything
|
||||
+int the filesystem. The run time is potentially very long, depending on the
|
||||
@ -15,20 +15,11 @@ index 6d2fd0c36086..12c2a2dc9fbd 100644
|
||||
`Options`
|
||||
+
|
||||
-d[<filters>]::::
|
||||
@@ -57,6 +63,8 @@ act on system chunks (only under -f). See `FILTERS` section for details about <f
|
||||
be verbose
|
||||
-f::::
|
||||
force reducing of metadata integrity
|
||||
+--full-balance::::
|
||||
+do not print the warning and do not delay start
|
||||
|
||||
*status* [-v] <path>::
|
||||
Show status of running or paused balance.
|
||||
diff --git a/cmds-balance.c b/cmds-balance.c
|
||||
index 9af218bbfa51..bab0e053c8bc 100644
|
||||
--- a/cmds-balance.c
|
||||
+++ b/cmds-balance.c
|
||||
@@ -298,8 +298,13 @@ static int do_balance_v1(int fd)
|
||||
Index: btrfs-progs-v4.3/cmds-balance.c
|
||||
===================================================================
|
||||
--- btrfs-progs-v4.3.orig/cmds-balance.c
|
||||
+++ btrfs-progs-v4.3/cmds-balance.c
|
||||
@@ -383,8 +383,13 @@ static int do_balance_v1(int fd)
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -43,9 +34,9 @@ index 9af218bbfa51..bab0e053c8bc 100644
|
||||
{
|
||||
int fd;
|
||||
int ret;
|
||||
@@ -312,6 +317,24 @@ static int do_balance(const char *path, struct btrfs_ioctl_balance_args *args,
|
||||
@@ -395,6 +400,24 @@ static int do_balance(const char *path,
|
||||
if (fd < 0)
|
||||
return 1;
|
||||
}
|
||||
|
||||
+ if (!(flags & BALANCE_START_FILTERS) && !(flags & BALANCE_START_NOWARN)) {
|
||||
+ int delay = 10;
|
||||
@ -68,7 +59,7 @@ index 9af218bbfa51..bab0e053c8bc 100644
|
||||
ret = ioctl(fd, BTRFS_IOC_BALANCE_V2, args);
|
||||
e = errno;
|
||||
|
||||
@@ -321,7 +344,7 @@ static int do_balance(const char *path, struct btrfs_ioctl_balance_args *args,
|
||||
@@ -404,7 +427,7 @@ static int do_balance(const char *path,
|
||||
* old one. But, the old one doesn't know any filters, so
|
||||
* don't fall back if they tried to use the fancy new things
|
||||
*/
|
||||
@ -77,7 +68,7 @@ index 9af218bbfa51..bab0e053c8bc 100644
|
||||
ret = do_balance_v1(fd);
|
||||
if (ret == 0)
|
||||
goto out;
|
||||
@@ -361,13 +384,16 @@ static const char * const cmd_balance_start_usage[] = {
|
||||
@@ -444,13 +467,16 @@ static const char * const cmd_balance_st
|
||||
"passed all filters in a comma-separated list of filters for a",
|
||||
"particular chunk type. If filter list is not given balance all",
|
||||
"chunks of that type. In case none of the -d, -m or -s options is",
|
||||
@ -95,7 +86,7 @@ index 9af218bbfa51..bab0e053c8bc 100644
|
||||
NULL
|
||||
};
|
||||
|
||||
@@ -378,19 +404,22 @@ static int cmd_balance_start(int argc, char **argv)
|
||||
@@ -461,19 +487,22 @@ static int cmd_balance_start(int argc, c
|
||||
&args.meta, NULL };
|
||||
int force = 0;
|
||||
int verbose = 0;
|
||||
@ -119,7 +110,7 @@ index 9af218bbfa51..bab0e053c8bc 100644
|
||||
{ NULL, 0, NULL, 0 }
|
||||
};
|
||||
|
||||
@@ -400,21 +429,21 @@ static int cmd_balance_start(int argc, char **argv)
|
||||
@@ -483,21 +512,21 @@ static int cmd_balance_start(int argc, c
|
||||
|
||||
switch (opt) {
|
||||
case 'd':
|
||||
@ -144,7 +135,7 @@ index 9af218bbfa51..bab0e053c8bc 100644
|
||||
args.flags |= BTRFS_BALANCE_METADATA;
|
||||
|
||||
if (parse_filters(optarg, &args.meta))
|
||||
@@ -426,6 +455,9 @@ static int cmd_balance_start(int argc, char **argv)
|
||||
@@ -509,6 +538,9 @@ static int cmd_balance_start(int argc, c
|
||||
case 'v':
|
||||
verbose = 1;
|
||||
break;
|
||||
@ -154,7 +145,7 @@ index 9af218bbfa51..bab0e053c8bc 100644
|
||||
default:
|
||||
usage(cmd_balance_start_usage);
|
||||
}
|
||||
@@ -451,7 +483,7 @@ static int cmd_balance_start(int argc, char **argv)
|
||||
@@ -534,7 +566,7 @@ static int cmd_balance_start(int argc, c
|
||||
sizeof(struct btrfs_balance_args));
|
||||
}
|
||||
|
||||
@ -163,7 +154,7 @@ index 9af218bbfa51..bab0e053c8bc 100644
|
||||
/* relocate everything - no filters */
|
||||
args.flags |= BTRFS_BALANCE_TYPE_MASK;
|
||||
}
|
||||
@@ -481,7 +513,7 @@ static int cmd_balance_start(int argc, char **argv)
|
||||
@@ -564,7 +596,7 @@ static int cmd_balance_start(int argc, c
|
||||
if (verbose)
|
||||
dump_ioctl_balance_args(&args);
|
||||
|
||||
@ -172,7 +163,7 @@ index 9af218bbfa51..bab0e053c8bc 100644
|
||||
}
|
||||
|
||||
static const char * const cmd_balance_pause_usage[] = {
|
||||
@@ -723,6 +755,16 @@ static int cmd_balance_status(int argc, char **argv)
|
||||
@@ -798,6 +830,16 @@ static int cmd_balance_status(int argc,
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -189,7 +180,7 @@ index 9af218bbfa51..bab0e053c8bc 100644
|
||||
static const char balance_cmd_group_info[] =
|
||||
"balance data accross devices, or change block groups using filters";
|
||||
|
||||
@@ -733,20 +775,21 @@ const struct cmd_group balance_cmd_group = {
|
||||
@@ -808,20 +850,21 @@ const struct cmd_group balance_cmd_group
|
||||
{ "cancel", cmd_balance_cancel, cmd_balance_cancel_usage, NULL, 0 },
|
||||
{ "resume", cmd_balance_resume, cmd_balance_resume_usage, NULL, 0 },
|
||||
{ "status", cmd_balance_status, cmd_balance_status_usage, NULL, 0 },
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fcf9bc995cb928717867a7892f1184276bf40ee3d2d7e712e75ef9b95c5bf853
|
||||
size 1384841
|
||||
3
btrfs-progs-v4.3.tar.gz
Normal file
3
btrfs-progs-v4.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e644345a502a28bb84645af407831790e0338f98cb18709f9c32fc3da6373689
|
||||
size 1430840
|
||||
@ -1,3 +1,49 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 13 00:00:00 CET 2015 - dsterba@suse.cz
|
||||
|
||||
- update to 4.3
|
||||
* mkfs
|
||||
* mixed mode is not forced for filesystems smaller than 1GiB
|
||||
* mixed mode broken with mismatching sectorsize and nodesize, fixed
|
||||
* print version info earlier
|
||||
* print devices sorted by id
|
||||
* do not truncate target image with --rootsize
|
||||
* fi usage:
|
||||
* don't print global block reserve
|
||||
* print device id
|
||||
* minor output tuning
|
||||
* other cleanups
|
||||
* calc-size:
|
||||
* div-by-zero fix on an empty filesystem
|
||||
* fix crash
|
||||
* bugfixes:
|
||||
* more superblock sanity checks
|
||||
* consistently round size of all devices down to sectorsize
|
||||
* misc leak fixes
|
||||
* convert: don't try to rollback with a half-deleted ext2_saved subvolume
|
||||
* other:
|
||||
* check: add progress indicator
|
||||
* scrub: enahced error message
|
||||
* show-super: read superblock from a given offset
|
||||
* add README
|
||||
* docs: update manual page for mkfs.btrfs, btrfstune, balance, convert and inspect-internal
|
||||
* build: optional build with more warnings (W=...)
|
||||
* build: better support for static checkers
|
||||
* build: html output of documentation
|
||||
* pretty-print: last_snapshot for root_item
|
||||
* pretty-print: stripe dev uuid
|
||||
* error reporting wrappers, introduced and example use
|
||||
* refactor open_file_or_dir
|
||||
* other docs and help updates
|
||||
* testing:
|
||||
* test for nodes crossing stripes
|
||||
* test for broken 'subvolume sync'
|
||||
* basic tests for mkfs, raid option combinations
|
||||
* basic tests for fuzzed images (check)
|
||||
* command intrumentation (eg valgrind)
|
||||
* print commands if requested
|
||||
* add README for tests
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 2 00:00:00 CET 2015 - dsterba@suse.cz
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
%endif
|
||||
|
||||
Name: btrfsprogs
|
||||
Version: 4.2.3
|
||||
Version: 4.3
|
||||
Release: 0
|
||||
Summary: Utilities for the Btrfs filesystem
|
||||
License: GPL-2.0
|
||||
|
||||
@ -6,8 +6,8 @@ Index: btrfs-progs-v4.1/version.sh
|
||||
# Copyright 2008, Oracle
|
||||
# Released under the GNU GPLv2
|
||||
|
||||
-v="v4.2.3"
|
||||
+v="v4.2.3+20151102"
|
||||
-v="v4.3"
|
||||
+v="v4.3+20151113"
|
||||
|
||||
opt=$1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user