platform/upstream/btrfs-progs.git
6 years agobtrfs-progs: print-tree: don't print the item type for all items
David Sterba [Thu, 31 Aug 2017 14:57:47 +0000 (16:57 +0200)]
btrfs-progs: print-tree: don't print the item type for all items

In some cases it's clear from the context which item is being printed,
so we can remove them. If the item has no data, some description is
still desired (eg. orphan or various backrefs).

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: print-tree: rename item callbacks to match the key name
David Sterba [Thu, 31 Aug 2017 14:34:15 +0000 (16:34 +0200)]
btrfs-progs: print-tree: rename item callbacks to match the key name

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: move fs roots check mode switch to a helper
David Sterba [Wed, 30 Aug 2017 17:47:50 +0000 (19:47 +0200)]
btrfs-progs: check: move fs roots check mode switch to a helper

Simplify main a bit.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: cleanup use of fs_info in check_fs_roots
David Sterba [Wed, 30 Aug 2017 17:52:44 +0000 (19:52 +0200)]
btrfs-progs: check: cleanup use of fs_info in check_fs_roots

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: pass fs_info to check_fs_roots
David Sterba [Wed, 30 Aug 2017 17:50:31 +0000 (19:50 +0200)]
btrfs-progs: check: pass fs_info to check_fs_roots

The root pointer is not used anyway, will be cleaned up next.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: move chunk and extent check mode switch to a helper
David Sterba [Wed, 30 Aug 2017 17:47:50 +0000 (19:47 +0200)]
btrfs-progs: check: move chunk and extent check mode switch to a helper

Simplify main a bit.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: pass fs_info to check_chunks_and_extents_v2
David Sterba [Wed, 30 Aug 2017 17:38:02 +0000 (19:38 +0200)]
btrfs-progs: check: pass fs_info to check_chunks_and_extents_v2

The root pointer is set to fs_root as was originally.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: use local fs_info in check_chunks_and_extents
David Sterba [Wed, 30 Aug 2017 17:41:15 +0000 (19:41 +0200)]
btrfs-progs: check: use local fs_info in check_chunks_and_extents

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: pass fs_info to check_chunks_and_extents
David Sterba [Wed, 30 Aug 2017 17:38:02 +0000 (19:38 +0200)]
btrfs-progs: check: pass fs_info to check_chunks_and_extents

The root pointer is set to fs_root as was originally.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: verify critical root pointers before use
David Sterba [Wed, 30 Aug 2017 17:25:11 +0000 (19:25 +0200)]
btrfs-progs: check: verify critical root pointers before use

The pointers to critical roots must be valid before we start using them,
eg. as the space clearing code.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: move more of space cache clearing to a helper
David Sterba [Wed, 30 Aug 2017 16:57:03 +0000 (18:57 +0200)]
btrfs-progs: check: move more of space cache clearing to a helper

Move the code out of main.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: remove old mixed backref code
David Sterba [Wed, 30 Aug 2017 14:56:51 +0000 (16:56 +0200)]
btrfs-progs: check: remove old mixed backref code

A code added in 2009 (95d3f20b51e9b) for a very short-lived change in
the format is no concern to us nowadays.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: add more sanitizer message patterns to log scanner
David Sterba [Wed, 30 Aug 2017 14:56:23 +0000 (16:56 +0200)]
btrfs-progs: tests: add more sanitizer message patterns to log scanner

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: convert: don't print message when fs is not recognized, ext2
David Sterba [Tue, 29 Aug 2017 17:42:10 +0000 (19:42 +0200)]
btrfs-progs: convert: don't print message when fs is not recognized, ext2

Bad magic error means it's not the desired filesystem so the error
message is just noise.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: limit size of log dump from conver tests
David Sterba [Tue, 29 Aug 2017 16:41:30 +0000 (18:41 +0200)]
btrfs-progs: tests: limit size of log dump from conver tests

The convert tests generate lots of log material, travis CI has limit 4MB
so we don't see anything useful when a late test fails.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: handle failed search in find_search_start better
David Sterba [Tue, 29 Aug 2017 16:19:03 +0000 (18:19 +0200)]
btrfs-progs: handle failed search in find_search_start better

The warning can pop up frequently on a fuzzed image, the message seems
to be enough. Add a more fitting error code too.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: add more error handling to btrfs_free_block_group
David Sterba [Tue, 29 Aug 2017 15:53:39 +0000 (17:53 +0200)]
btrfs-progs: add more error handling to btrfs_free_block_group

As btrfs_update_block_group fails when the block group is not found in
cache, we can exit btrfs_free_block_group, not much to rollback. The
caller will also exit in turn.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: fix TEST_LOG=dump in convert tests
David Sterba [Tue, 29 Aug 2017 15:42:28 +0000 (17:42 +0200)]
btrfs-progs: tests: fix TEST_LOG=dump in convert tests

Test failure in convert tests with log dump does not happen because
_fail is called before that and exits. Other test types are ok.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: handle transaction start failure in close_ctree
David Sterba [Tue, 29 Aug 2017 15:22:39 +0000 (17:22 +0200)]
btrfs-progs: handle transaction start failure in close_ctree

Closing the fs will try to commit a pending transaction, but may fail to
do so if the filesystem state is not well defined. This will eg.  fail
for some fuzz tests. The data structures are freed but no furhter
attempt to commit is made.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: update README
David Sterba [Tue, 29 Aug 2017 15:07:15 +0000 (17:07 +0200)]
btrfs-progs: tests: update README

Wording, runtime dependencies.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: install missing CI packages
David Sterba [Tue, 29 Aug 2017 14:36:15 +0000 (16:36 +0200)]
btrfs-progs: tests: install missing CI packages

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: add more checks for tools used in convert tests
David Sterba [Tue, 29 Aug 2017 14:35:01 +0000 (16:35 +0200)]
btrfs-progs: tests: add more checks for tools used in convert tests

Tools that may not be present in common installations should be checked
in the tests.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: build preparation phases out of script section
David Sterba [Tue, 29 Aug 2017 14:16:44 +0000 (16:16 +0200)]
btrfs-progs: tests: build preparation phases out of script section

The logs of before_install are folded and we don't need to see the
details, unlike the test logs.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: don't start or commit after transaction abort
David Sterba [Tue, 29 Aug 2017 12:55:37 +0000 (14:55 +0200)]
btrfs-progs: don't start or commit after transaction abort

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: start framework for transaction abort
David Sterba [Mon, 28 Aug 2017 15:44:41 +0000 (17:44 +0200)]
btrfs-progs: start framework for transaction abort

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: store pointer to fs_info in transaction handle
David Sterba [Mon, 28 Aug 2017 15:43:10 +0000 (17:43 +0200)]
btrfs-progs: store pointer to fs_info in transaction handle

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: move transaction code out of disk-io
David Sterba [Mon, 28 Aug 2017 15:39:26 +0000 (17:39 +0200)]
btrfs-progs: move transaction code out of disk-io

Temporarily export the low-level helpers.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: move transaction implementation out of header
David Sterba [Mon, 28 Aug 2017 15:27:08 +0000 (17:27 +0200)]
btrfs-progs: move transaction implementation out of header

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: use kzalloc to allocate transaction handle
David Sterba [Mon, 28 Aug 2017 15:21:05 +0000 (17:21 +0200)]
btrfs-progs: use kzalloc to allocate transaction handle

Use the kernel-style allocation helpers and remove redundant zeroing.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: switch fs_info::system_allocs to bit
David Sterba [Mon, 28 Aug 2017 15:16:51 +0000 (17:16 +0200)]
btrfs-progs: switch fs_info::system_allocs to bit

The value really is 0 or 1, the test in btrfs_reserve_extent can be
simplified.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: return errors from btrfs_start_transaction
David Sterba [Mon, 28 Aug 2017 14:54:12 +0000 (16:54 +0200)]
btrfs-progs: return errors from btrfs_start_transaction

Now that all callers will catch errors, we can return them from the
function.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: add crude error handling when transaction start fails
David Sterba [Mon, 28 Aug 2017 14:48:16 +0000 (16:48 +0200)]
btrfs-progs: add crude error handling when transaction start fails

Currently transaction bugs out insided btrfs_start_transaction in case
of error, we want to lift the error handling to the callers. This patch
adds the BUG_ON anywhere it's been missing so far. This is not the best
way of course. Transforming BUG_ON to a proper error handling highly
depends on the caller and should be dealt with case by case.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: pull and build reiserfs lib inside CI
David Sterba [Mon, 28 Aug 2017 12:28:53 +0000 (14:28 +0200)]
btrfs-progs: tests: pull and build reiserfs lib inside CI

The functionality needed to support reiserfs in convert has been added
recently and is not yet available in the CI images, so we'll download
and build it there.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: add build checks for sanitization features
David Sterba [Mon, 28 Aug 2017 11:54:02 +0000 (13:54 +0200)]
btrfs-progs: tests: add build checks for sanitization features

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: build: fix asan and ubsan build
David Sterba [Mon, 28 Aug 2017 11:38:32 +0000 (13:38 +0200)]
btrfs-progs: build: fix asan and ubsan build

Probably with a new gcc (7.1.1) I started to see asan/ubsan link failures.
Fixed by explicitly linking the libraries.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: build: fix building libbtrfs.so with tsan
David Sterba [Mon, 28 Aug 2017 11:33:19 +0000 (13:33 +0200)]
btrfs-progs: build: fix building libbtrfs.so with tsan

Except libbtrfs.so object, all other tools compile fine. The error is:

ld: send-stream.o: relocation R_X86_64_PC32 against symbol
`stderr@@GLIBC_2.2.5' can not be used when making a shared object;
recompile with -fPIC

Compiling with -fPIC fixes the problem.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: build: properly pass the LDFLAGS during tsan build
David Sterba [Fri, 25 Aug 2017 18:09:34 +0000 (20:09 +0200)]
btrfs-progs: build: properly pass the LDFLAGS during tsan build

The variable LD_FLAGS does not exist and the flags are not used, we need
to use the newly added internal debugging linker flags.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: build: add internal LDFLAGS for the D= features
David Sterba [Fri, 25 Aug 2017 18:04:48 +0000 (20:04 +0200)]
btrfs-progs: build: add internal LDFLAGS for the D= features

We might want to pass additional linker flags for various sanitization
features.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: add more fuzzed images from bugzilla
David Sterba [Fri, 25 Aug 2017 17:21:01 +0000 (19:21 +0200)]
btrfs-progs: tests: add more fuzzed images from bugzilla

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: handle blockgroup errors when opening filesystem
David Sterba [Fri, 25 Aug 2017 17:08:37 +0000 (19:08 +0200)]
btrfs-progs: handle blockgroup errors when opening filesystem

The call to btrfs_read_block_groups could loop if the metadata are
damaged (reported eg. for an unaligned block), due to lack of error
handling. We have to check for restored images or currently created
filesystems, that do not contain the blockgroups.

Can be reproduced by fuzzed image bko-155551.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=155551
Reported-by: Lukas Lueg <lukas.lueg@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: drop blocksize argument from readahead_tree_block
David Sterba [Fri, 25 Aug 2017 16:07:15 +0000 (18:07 +0200)]
btrfs-progs: drop blocksize argument from readahead_tree_block

Tree blocks are always nodesize. As readahead is only an optimization,
exact size is not required and is only advisory.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: drop blocksize argument from btrfs_find_create_tree_block
David Sterba [Fri, 25 Aug 2017 15:44:22 +0000 (17:44 +0200)]
btrfs-progs: drop blocksize argument from btrfs_find_create_tree_block

Metadata blocks are always nodesize. When reading the
superblock::sys_array, the actual size of data is fixed to 4k and
smaller than nodesize, but otherwise everything works as before.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: drop redundant check of blocksize in read_tree_block
David Sterba [Fri, 25 Aug 2017 15:30:34 +0000 (17:30 +0200)]
btrfs-progs: drop redundant check of blocksize in read_tree_block

The tree blocks are supposed to be always of nodesize. Before the
parameter has been dropped, it was unlikely but possible to pass a
misaligned value.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: cleanup use of level_size
David Sterba [Fri, 25 Aug 2017 15:21:03 +0000 (17:21 +0200)]
btrfs-progs: check: cleanup use of level_size

Nodesize is same for all levels, besides it's been only set and not
used, in root_item_record.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: drop blocksize from read_tree_block
David Sterba [Fri, 25 Aug 2017 14:54:16 +0000 (16:54 +0200)]
btrfs-progs: drop blocksize from read_tree_block

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: drop local blocksize variables if they're nodesize
David Sterba [Fri, 25 Aug 2017 14:20:16 +0000 (16:20 +0200)]
btrfs-progs: drop local blocksize variables if they're nodesize

Prep work so we can drop the blocksize argument from several functions.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: build: fix PIE build
David Sterba [Fri, 25 Aug 2017 12:26:51 +0000 (14:26 +0200)]
btrfs-progs: build: fix PIE build

Patch from Marcus Meissner <meissner@suse.com>. The CFLAGS are passed to
the linker and mix up the compilation and linker flags for PIE support.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: convert: move reiserfs struct definitions to header
David Sterba [Thu, 24 Aug 2017 13:48:48 +0000 (15:48 +0200)]
btrfs-progs: convert: move reiserfs struct definitions to header

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: convert: move and rename dev_t helpers to common file
David Sterba [Tue, 22 Aug 2017 18:43:49 +0000 (20:43 +0200)]
btrfs-progs: convert: move and rename dev_t helpers to common file

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: convert: move acl helper to common source file
David Sterba [Tue, 22 Aug 2017 18:34:36 +0000 (20:34 +0200)]
btrfs-progs: convert: move acl helper to common source file

There were 2 copies of ext2_acl_count and acl_ea_size.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: convert: move duplicated acl code to common header
David Sterba [Tue, 22 Aug 2017 18:30:43 +0000 (20:30 +0200)]
btrfs-progs: convert: move duplicated acl code to common header

The ACL types and macros are same for both source filesystem.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: docs: update btrfs-convert regarding reiserfs
David Sterba [Tue, 22 Aug 2017 17:18:48 +0000 (19:18 +0200)]
btrfs-progs: docs: update btrfs-convert regarding reiserfs

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: add support for converting reiserfs
Jeff Mahoney [Tue, 22 Aug 2017 16:32:57 +0000 (18:32 +0200)]
btrfs-progs: tests: add support for converting reiserfs

Many of the test cases for convert apply regardless of what the source
file system is and using ext4 is sufficient.  I've included several
test cases that are reiserfs-specific.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
[ patch split from the previous one, minor cleanups in common.convert ]
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: convert: add support for converting reiserfs
Jeff Mahoney [Tue, 22 Aug 2017 16:30:43 +0000 (18:30 +0200)]
btrfs-progs: convert: add support for converting reiserfs

This patch adds support to convert reiserfs file systems in-place to btrfs.

It will convert extended attribute files to btrfs extended attributes,
translate ACLs, coalesce tails that consist of multiple items into one item,
and convert tails that are too big into indirect files.

This requires that libreiserfscore 3.6.27 be available.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: Use named constants for common sizes
Nikolay Borisov [Thu, 27 Jul 2017 08:17:00 +0000 (11:17 +0300)]
btrfs-progs: Use named constants for common sizes

There multiple places where we use well-known sizes - 1,8,16,32 megabytes. We
also have them defined as constants in the sizes.h header. So let's use them.
No functional changes.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: mkfs: Replace number with enum
Gu Jinxiang [Wed, 28 Jun 2017 09:59:24 +0000 (17:59 +0800)]
btrfs-progs: mkfs: Replace number with enum

For code maintainability and scalability,
replace hardcoded constant with a meaningful enum.

Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
[ add MKFS_ prefix ]
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: fix _is_file_or_command detection
David Sterba [Fri, 25 Aug 2017 13:44:24 +0000 (15:44 +0200)]
btrfs-progs: tests: fix _is_file_or_command detection

type -p returns an empty string for nonexistent commands, but the -f
test on an empty string does not behave the same on all shells. To be
safe, use the quoted value.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agoBtrfs progs v4.12.1
David Sterba [Fri, 25 Aug 2017 13:11:11 +0000 (15:11 +0200)]
Btrfs progs v4.12.1

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: update CHANGES for v4.12.1
David Sterba [Fri, 31 Mar 2017 12:20:21 +0000 (14:20 +0200)]
btrfs-progs: update CHANGES for v4.12.1

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: docs: add figure 1 to btrfs quota doc
Misono, Tomohiro [Thu, 24 Aug 2017 17:45:55 +0000 (19:45 +0200)]
btrfs-progs: docs: add figure 1 to btrfs quota doc

The document of btrfs quota is missing figure 1.

I notice the body is copy of http://sensille.com/qgroups.pdf (which is
linked from https://btrfs.wiki.kernel.org/index.php/Quota_support), and
insert the figure.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: docs: add missing short option for qroup-report
Misono, Tomohiro [Thu, 24 Aug 2017 06:06:41 +0000 (15:06 +0900)]
btrfs-progs: docs: add missing short option for qroup-report

Usage info of "btrfs check" shows "-Q|--qgroup-report" (and first patch
enables -Q), but the document only shows "--qgroup-report".

Therefore add -Q to the doc.

Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: dump-super: add missing long option bytenr to getopt
Misono, Tomohiro [Thu, 24 Aug 2017 05:25:29 +0000 (14:25 +0900)]
btrfs-progs: dump-super: add missing long option bytenr to getopt

This fixes "btrfs inspect-internal dump-super --bytenr"

Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: recieve: add missing short option E to getopt
Misono, Tomohiro [Thu, 24 Aug 2017 05:24:03 +0000 (14:24 +0900)]
btrfs-progs: recieve: add missing short option E to getopt

This fixes "btrfs receive -E".

Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: add missing short options E and Q to getopt
Misono, Tomohiro [Thu, 24 Aug 2017 05:18:25 +0000 (14:18 +0900)]
btrfs-progs: check: add missing short options E and Q to getopt

I found some btrfs commands options are not working because of
inappropriate getopt_long() setting.

This fixes "btrfs check -Q/-E"

Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: move command definitions to commands.h
David Sterba [Thu, 24 Aug 2017 16:32:18 +0000 (18:32 +0200)]
btrfs-progs: move command definitions to commands.h

There are some trivial helpers, we can group the command declarations in
one place.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: catch bad usage of run_mustfail
David Sterba [Wed, 23 Aug 2017 17:26:42 +0000 (19:26 +0200)]
btrfs-progs: tests: catch bad usage of run_mustfail

This function has an extra argument and can get forgotten, add a sanity
check so the bad usage can be caught during development.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: scan results for commands not found
David Sterba [Wed, 23 Aug 2017 17:19:47 +0000 (19:19 +0200)]
btrfs-progs: tests: scan results for commands not found

In case of typos or messed up command execution, we'd like to be able to
catch that.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: fsck-test: case for corrupted dir item name
Su Yue [Fri, 14 Jul 2017 07:47:46 +0000 (15:47 +0800)]
btrfs-progs: fsck-test: case for corrupted dir item name

In this test case, all name in dir_item, dir_index, inode_ref
are corrupted to another one.
btrfs check should report errors about the corrupted dir_item but
btrfs can't repair the case now.

Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: verify dir item name and hash in lowmem mode
Su Yue [Fri, 14 Jul 2017 07:47:45 +0000 (15:47 +0800)]
btrfs-progs: check: verify dir item name and hash in lowmem mode

Although lowmem mode can detect name and hash mismatch in dir_item,
it's done by checking inode_ref to expose such problem.

This patch will enhance dir_item check, by also comparing name and
hash when checking dir_items.

Reported-by: Filippe LeMarchand <gasinvein@gmail.com>
Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: check: verify name in dir_item for original mode
Su Yue [Fri, 14 Jul 2017 07:47:44 +0000 (15:47 +0800)]
btrfs-progs: check: verify name in dir_item for original mode

In original mode, we don't check if the name in dir_item matches the
hash in key.offset.

In the following case, original mode will report nothing wrong while
lowmem mode will detect the name and hash mismatch.

------
item 72 key (79177 DIR_ITEM 54846528) itemoff 12380 itemsize 88
        location key (4222342 INODE_ITEM 0) type FILE
        transid 170929 data_len 0 name_len 14
        name: deprecated.sxt
        location key (13590433 INODE_ITEM 0) type FILE
        transid 796448 data_len 0 name_len 14
        name: deprecated.txt
------
In above case, hash of "deprecated.txt" matches with 54846528,
while hash of "deprecated.sxt" should be 2008317993.

Reported-by: Filippe LeMarchand <gasinvein@gmail.com>
Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: fix typo in convert-tests/008-readonly-image
Jeff Mahoney [Tue, 22 Aug 2017 17:44:44 +0000 (19:44 +0200)]
btrfs-progs: tests: fix typo in convert-tests/008-readonly-image

The dd in convert-tests/008-readonly-image is expected to fail, so
there being a typo in the file name has gone unnoticed.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: convert: use search_cache_extent in migrate_one_reserved_range
Jeff Mahoney [Thu, 27 Jul 2017 15:47:21 +0000 (11:47 -0400)]
btrfs-progs: convert: use search_cache_extent in migrate_one_reserved_range

When we are looking for extents in migrate_one_reserved_range, it's likely
that there will be multiple extents that fall into the 0-1MB range.

If lookup_cache_extent is called with a range that covers multiple cache
entries, it will return the first entry it encounters while searching
from the top of the tree that happens to fall in that range.  That
means that we can end up skipping regions within that range, resulting
in a file system image that can't be rolled back since it wasn't
all migrated properly.

This is reproducible using convert-tests/008-readonly-image.  There was
a range from 0-160kB, but the only entry that was returned began at
~ 280kB.

The fix is to use search_cache_extent to iterate through multiple regions
within that range.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Qu Wenruo <quwenruo.btrfs@gmx.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: convert: add missing newlines for printfs
Jeff Mahoney [Tue, 25 Jul 2017 20:54:42 +0000 (16:54 -0400)]
btrfs-progs: convert: add missing newlines for printfs

There are two printfs with missing newlines that end up making the
output wonky.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Qu Wenruo <quwenruo.btrfs@gmx.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: convert: properly handle reserved ranges while iterating files
Jeff Mahoney [Tue, 25 Jul 2017 20:54:41 +0000 (16:54 -0400)]
btrfs-progs: convert: properly handle reserved ranges while iterating files

Commit 522ef705e38 (btrfs-progs: convert: Introduce function to calculate
the available space) changed how we handle migrating file data so that
we never have btrfs space associated with the reserved ranges.  This
works pretty well and when we iterate over the file blocks, the
associations are redirected to the migrated locations.

This commit missed the case in block_iterate_proc where we just check
for intersection with a superblock location before looking up a block
group.  intersect_with_sb checks to see if the range intersects with
a stripe containing a superblock but, in fact, we've reserved the
full 0-1MB range at the start of the disk.  So a file block located
at e.g. 160kB will fall in the reserved region but won't be excepted
in block_iterate_block.  We ultimately hit a BUG_ON when we fail
to look up the block group for that location.

This is reproducible using convert-tests/003-ext4-basic.

The fix is to have intersect_with_sb and block_iterate_proc understand
the full size of the reserved ranges.  Since we use the range to
determine the boundary for the block iterator, let's just return the
boundary.  0 isn't a valid boundary and means that we proceed normally
with block group lookup.

Cc: Qu Wenruo <quwenruo.btrfs@gmx.com>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Qu Wenruo <quwenruo.btrfs@gmx.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: Use already defined BTRFS_BLOCK_GROUP_PROFILE_MASK
Nikolay Borisov [Thu, 27 Jul 2017 08:16:59 +0000 (11:16 +0300)]
btrfs-progs: Use already defined BTRFS_BLOCK_GROUP_PROFILE_MASK

Instead of opencoding it. No functional changes.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: mkfs: Make in-place exit to a common exit block
Gu Jinxiang [Tue, 22 Aug 2017 05:35:06 +0000 (13:35 +0800)]
btrfs-progs: mkfs: Make in-place exit to a common exit block

Replace in-place exit with a common exit block in the main function.

Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
[ update changelog ]
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: mkfs: delete un-used parameter fd
Gu Jinxiang [Fri, 18 Aug 2017 08:32:46 +0000 (01:32 -0700)]
btrfs-progs: mkfs: delete un-used parameter fd

Parameter fd is not used in function make_image and traverse_directory
of mkfs.  Delete it.

Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: Allow inspect dump-tree to show specified tree block even some tree...
Qu Wenruo [Fri, 18 Aug 2017 09:36:30 +0000 (18:36 +0900)]
btrfs-progs: Allow inspect dump-tree to show specified tree block even some tree roots are corrupted

For btrfs inspect-internal dump-tree, if we use "-b" parameter to show
specified tree block, then we don't really need extra tree roots.

Only chunk root is needed to build up the whole chunk mapping so we can
read tree blocks.

This patch will add __OPEN_CTREE_RETURN_CHUNK_ROOT flag when show
speicifed tree block.
So even root tree is corrupted, we can still use inspect-internal
dump-tree to do some debugging.

Reported-by: Zirconium Hacker <jared.e.vb@gmail.com>
Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: Doc: Fix asciidoc grammar of btrfs-rescue
Qu Wenruo [Mon, 21 Aug 2017 06:57:04 +0000 (15:57 +0900)]
btrfs-progs: Doc: Fix asciidoc grammar of btrfs-rescue

Code block of kernel backtrace lacks leading change line, causing the
following man page result:
------
           One can determine whether zero-log is needed according to the
           kernel backtrace:

           ? replay_one_dir_item+0xb5/0xb5 [btrfs]
           ? walk_log_tree+0x9c/0x19d [btrfs]
           ? btrfs_read_fs_root_no_radix+0x169/0x1a1 [btrfs]
           ? btrfs_recover_log_trees+0x195/0x29c [btrfs]
           ? replay_one_dir_item+0xb5/0xb5 [btrfs]
           ? btree_read_extent_buffer_pages+0x76/0xbc [btrfs]
           ? open_ctree+0xff6/0x132c [btrfs]

       + If the errors are like above, then zero-log should be used to clear
       the log and the filesystem may be mounted normally again. The keywords
------

Not only "+" is rendered as is, but also wrong indent.

Fix it by adding change line before code block.

Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: Specify C standard to gnu90 explicitly
Qu Wenruo [Tue, 15 Aug 2017 00:17:12 +0000 (09:17 +0900)]
btrfs-progs: Specify C standard to gnu90 explicitly

Different C compilers have different default language standard.
This sometimes causes problem on different system.

For distribution like CentOS/RHEL7, its gcc is still 4.8 and will report
error for c90 style declaration, while most developers are using newer
gcc which will just ignore it.
This makes us hard to detect such language standard problem.

This patch will specify standard to gnu90 explicitly to avoid such problem.
Gnu90 is a good mix of c90 while provide a lot of useful gnu extension,
and is supported by all modern gcc and clang.

Reported-by: Marco Lorenzo Crociani <marcoc@prismatelecomtesting.com>
Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: kernel-lib: add generated tables.c
David Sterba [Mon, 14 Aug 2017 13:14:16 +0000 (15:14 +0200)]
btrfs-progs: kernel-lib: add generated tables.c

The contents of tables.c hasn't changed for more than 15 years, we don't
expect any changes to current contents. New tables might be still added,
in that case the file should be regenerated using the included mktables
tool and updated.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: build: do not regenerate kernel-lib/tables.c
David Sterba [Mon, 14 Aug 2017 13:09:45 +0000 (15:09 +0200)]
btrfs-progs: build: do not regenerate kernel-lib/tables.c

As reported in
https://www.mail-archive.com/linux-btrfs@vger.kernel.org/msg66765.html
cross-compilation does not work very well with current tables.c. We can
simpy keep the pergenerated file in the repository and update if needed.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agoBtrfs progs v4.12
David Sterba [Fri, 28 Jul 2017 13:29:46 +0000 (15:29 +0200)]
Btrfs progs v4.12

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: update CHANGES for v4.12
David Sterba [Fri, 31 Mar 2017 12:20:21 +0000 (14:20 +0200)]
btrfs-progs: update CHANGES for v4.12

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: docs: update wording for compression mount options
David Sterba [Mon, 24 Jul 2017 14:45:40 +0000 (16:45 +0200)]
btrfs-progs: docs: update wording for compression mount options

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: Use '-t btrfs' mount option in tests
Adam Buchbinder [Wed, 12 Jul 2017 20:05:22 +0000 (13:05 -0700)]
btrfs-progs: tests: Use '-t btrfs' mount option in tests

Without it, mount (at least from util-linux 2.20.1) tries (and fails) to
mount some filesystems as NTFS.

Signed-off-by: Adam Buchbinder <abuchbinder@google.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: use separate helper for mounting convert filesystems
David Sterba [Thu, 20 Jul 2017 16:44:49 +0000 (18:44 +0200)]
btrfs-progs: tests: use separate helper for mounting convert filesystems

We'll enforce the btrfs type for mount everwhere so we must provide a
way to mount converted filesystems. Add a new helper that will try to
mount the given type.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: enhance API to request type of the converted filesystem
David Sterba [Thu, 20 Jul 2017 15:53:56 +0000 (17:53 +0200)]
btrfs-progs: tests: enhance API to request type of the converted filesystem

We'll use mount -t $fstype later on, extend the API so we don't have to
parse the type from other parameters.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: docs: adjust wording for subvol delete
David Sterba [Wed, 19 Jul 2017 19:01:30 +0000 (21:01 +0200)]
btrfs-progs: docs: adjust wording for subvol delete

Slightly update the text about deletion after the discussion on IRC.

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: docs: enhance documentation of 'btrfs device ready'
David Sterba [Mon, 17 Jul 2017 15:58:50 +0000 (17:58 +0200)]
btrfs-progs: docs: enhance documentation of 'btrfs device ready'

There were questions raised about the purpose of the 'dev ready'
command.

Link: https://marc.info/?l=linux-btrfs&m=149944574207325
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: docs: move deprecated mount option to own section
David Sterba [Mon, 17 Jul 2017 14:44:02 +0000 (16:44 +0200)]
btrfs-progs: docs: move deprecated mount option to own section

- alloc_start
- recovery
- subvolrootid

Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: subvol show: add support to search subvolume by rootid or uuid
Anand Jain [Wed, 12 Jul 2017 22:47:11 +0000 (06:47 +0800)]
btrfs-progs: subvol show: add support to search subvolume by rootid or uuid

Unless the top level is mounted there is no way to know the
details of all the subvolume.  For example:

mount -o subvol=sv1/newsv1 /dev/sdb /btrfs

btrfs su list /btrfs
ID 257 gen 12 top level 5 path sv1
ID 258 gen 9 top level 257 path sv1/snap
ID 259 gen 11 top level 257 path sv1/newsv1

You can't subvol show for sv1 and sv1/snap as its paths aren't
accessible to the user unless the its top level is mounted.

This patch adds two new options to the existing btrfs subvol show
cli. They are --rootid/-r or --uuid/-u, with this now the user will
be able to look for a subvolume using the rootid OR the uuid.

./btrfs su show -r 257 /btrfs
sv1
Name:  sv1
UUID:  30129358-c69d-3e4a-a662-29509cc69c95
Parent UUID:  -
Received UUID:  -
Creation time:  2017-07-11 20:32:57 +0800
Subvolume ID:  257
Generation:  12
Gen at creation:  7
Parent ID:  5
Top level ID:  5
Flags:  -
Snapshot(s):
sv1/snap

Signed-off-by: Anand Jain <anand.jain@oracle.com>
[ minor adjustments in the help text ]
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: build: Enable ThreadSanitizer, using D=tsan
Adam Buchbinder [Wed, 12 Jul 2017 20:04:49 +0000 (13:04 -0700)]
btrfs-progs: build: Enable ThreadSanitizer, using D=tsan

Tested with clang-3.9. We have to enable PIE,
(https://clang.llvm.org/docs/ThreadSanitizer.html)

Signed-off-by: Adam Buchbinder <abuchbinder@google.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: Fix an infinite loop in btrfs_next_bg
Justin Maggard [Fri, 9 Jun 2017 18:09:35 +0000 (11:09 -0700)]
btrfs-progs: Fix an infinite loop in btrfs_next_bg

I've run into a couple filesystems where btrfs-find-root would spin
indefinitely.

If the first cache extent start location is 0, we end up in an infinite
loop in btrfs_next_bg().  Fix it by checking for that situation, and
jumping to the next bg if necessary.

Fixes: e2e0dae9 (btrfs-progs: volume: Fix a bug causing btrfs-find-root to skip first chunk)
Signed-off-by: Justin Maggard <jmaggard@netgear.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agoBtrfs-progs: fix infinite loop in find_free_extent
Liu Bo [Mon, 26 Jun 2017 17:34:41 +0000 (11:34 -0600)]
Btrfs-progs: fix infinite loop in find_free_extent

If the found %ins is crossing a stripe len, ie. BTRFS_STRIPE_LEN, we'd
search again with a stripe-aligned %search_start.  The current code
calculates %search_start by adding a wrong offset, in order to fix it, the
start position of the block group should be taken, otherwise, it'll end up
with looking at the same block group forever.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: Tighten integer types in print-tree
Adam Buchbinder [Mon, 10 Jul 2017 21:29:09 +0000 (14:29 -0700)]
btrfs-progs: Tighten integer types in print-tree

There are likely more places where the wrong size types are used, but
these tripped Clang's warnings because they eventually get passed to
printf.

Signed-off-by: Adam Buchbinder <abuchbinder@google.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: tests: Fix missing internal deps in check and misc tests
Adam Buchbinder [Mon, 10 Jul 2017 21:29:08 +0000 (14:29 -0700)]
btrfs-progs: tests: Fix missing internal deps in check and misc tests

Doing a straight 'make test' would fail because some misc and fsck
tests require particular tools to already be built. Add dependencies
at the Makefile and shell-script level.

Signed-off-by: Adam Buchbinder <abuchbinder@google.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: subvol show: fix the path use full_path as provided by the root info
Anand Jain [Wed, 12 Jul 2017 07:20:27 +0000 (15:20 +0800)]
btrfs-progs: subvol show: fix the path use full_path as provided by the root info

This is a kind of preparatory patch for the patch which will add
--rootid and --uuid options for the btrfs subvol show command.

As of now btrfs subvol show is using the external user provided subvol
path to show in the output. Which is kind of confusing.

btrfs su show /btrfs
/btrfs <--
Name:  <FS_TREE>

It will be even more confusing when proposed --uuid or --rootid
options are used.

btrfs su show --rootid 258 /btrfs
/btrfs <--
Name:  snap <--
UUID:  9630a45f-e647-4242-bd19-97590b4e20b2
Parent UUID:  30129358-c69d-3e4a-a662-29509cc69c95
Received UUID:  -
Creation time:  2017-07-12 12:43:28 +0800
Subvolume ID:  258
Generation:  9
Gen at creation:  9
Parent ID:  257
Top level ID:  257
Flags:  -
Snapshot(s):

Now with this patch, it will only show what is provided by the root_info.

btrfs su show --rootid 258 /btrfs
sv1/snap <--
Name:  snap
UUID:  9630a45f-e647-4242-bd19-97590b4e20b2
Parent UUID:  30129358-c69d-3e4a-a662-29509cc69c95
Received UUID:  -
Creation time:  2017-07-12 12:43:28 +0800
Subvolume ID:  258
Generation:  9
Gen at creation:  9
Parent ID:  257
Top level ID:  257
Flags:  -
Snapshot(s):

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: image: fix typos in messages
Adam Buchbinder [Wed, 12 Jul 2017 22:10:13 +0000 (00:10 +0200)]
btrfs-progs: image: fix typos in messages

Signed-off-by: Adam Buchbinder <abuchbinder@google.com>
[ separated from the previous patch ]
Signed-off-by: David Sterba <dsterba@suse.com>
6 years agobtrfs-progs: image: Fix data races when reporting progress
Adam Buchbinder [Wed, 12 Jul 2017 20:05:10 +0000 (13:05 -0700)]
btrfs-progs: image: Fix data races when reporting progress

Making the code data-race safe requires that reads *and* writes
happen under a mutex lock, if any of the access are writes. See
Dmitri Vyukov, "Benign data races: what could possibly go wrong?"
for more details.

The fix here was to put most of the main loop of restore_worker
under a mutex lock.

This race was detected using fsck-tests/012-leaf-corruption.

==================
WARNING: ThreadSanitizer: data race
  Write of size 4 by main thread:
    #0 add_cluster btrfs-progs/image/main.c:1931
    #1 restore_metadump btrfs-progs/image/main.c:2566
    #2 main btrfs-progs/image/main.c:2859

  Previous read of size 4 by thread T6:
    #0 restore_worker btrfs-progs/image/main.c:1720

  Location is stack of main thread.

  Thread T6 (running) created by main thread at:
    #0 pthread_create <null>
    #1 mdrestore_init btrfs-progs/image/main.c:1868
    #2 restore_metadump btrfs-progs/image/main.c:2534
    #3 main btrfs-progs/image/main.c:2859

SUMMARY: ThreadSanitizer: data race btrfs-progs/image/main.c:1931 in
add_cluster

Signed-off-by: Adam Buchbinder <abuchbinder@google.com>
Signed-off-by: David Sterba <dsterba@suse.com>