summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* btrfs-progs: fix build of btrfs-show-superDavid Sterba2018-01-03
| | | | | | | | | The standalone utility btrfs-show-super has been obsoleted by 'btrfs inspect-internal dump-super' but it's still in the repository and should build in case somebody still uses it. Reported-by: "John L. Center" <jlcenter15@gmail.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: dump-tree: print c/o/s/r time of ROOT_ITEMMisono, Tomohiro2018-01-03
| | | | | | | | | | Currently ctime/otime/stime/rtime of ROOT_ITEM are not printed in print_root_item(). Fix this and print them if the values are not zero. The function print_timespec() is moved forward to reuse. Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: tests: fix path for travis helper scriptDavid Sterba2018-01-03
| | | | | | | | The helper script ./travis-should-run-test has been moved to a directory in 4.13.3 but the path in the config was not updated. This was not caught in the CI environment and the tests did not report a failure. Signed-off-by: David Sterba <dsterba@suse.com>
* Btrfs progs v4.14David Sterba2017-11-20
| | | | Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: update CHANGES for v4.14David Sterba2017-11-14
| | | | Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: docs: move the rescue fix-device-size command and updateDavid Sterba2017-11-14
| | | | | | | The subcommands are supposed to be in alphabetical order, move it to the right spot and reword. Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: build: mention library dependency for reiserfsDavid Sterba2017-11-14
| | | | Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: build: require libzstd support by defaultDavid Sterba2017-11-14
| | | | | | | | The kernel 4.14 supports zstd, for version parity the btrfs-progs now require libzstd by default. This can still be disabled by ./configure --disable-zstd. Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: convert: add missing types headerBaruch Siach2017-11-14
| | | | | | | | | | | | | | | | | Build with musl libc needs the sys/types.h header for the dev_t type, since this header is not included indirectly. This fixes the following build failure: In file included from convert/source-fs.c:23:0: ./convert/source-fs.h:112:1: error: unknown type name ‘dev_t’ dev_t decode_dev(u32 dev); ^~~~~ convert/source-fs.c:31:1: error: unknown type name ‘dev_t’ dev_t decode_dev(u32 dev) ^~~~~ Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: print-tree: Print offset as tree objectid for ROOT_ITEMQu Wenruo2017-11-14
| | | | | | | | | | | | | | | | | | | | | For cases like reloc trees and subvolume trees, their key offset is the tree id. The key will be printed as: (TREE_RELOC ROOT_ITEM 18446744073709551607) The negative number is long and even guys with real engineer brains can't easily get the meaning. This patch will change the output format to: (TREE_RELOC ROOT_ITEM DATA_RELOC_TREE) While for special offset value like 0 or (u64)-1, it's still shown as is. Signed-off-by: Qu Wenruo <wqu@suse.com> [ reword comment ] Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: qgroup: split update_qgroup to reduce argumentsLu Fengqi2017-11-14
| | | | | | | | | The function update_qgroup has too many arguments that are too difficult to use. Therefore, split it to update_qgroup_info, update_qgroup_limit, update_qgroup_relation. Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: qgroup: cleanup the redundant function add_qgroupLu Fengqi2017-11-14
| | | | | | | | | | There are reusable parts between update_qgroup and add_qgroup. So introduce the function get_or_add_qgroup and use update_qgroup instead of add_qgroup. No functional changes. Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: test: Add test image for lowmem mode referencer count mismatch ↵Lu Fengqi2017-11-14
| | | | | | | | | | | false alert Add a image which can reproduce the extent item referencer count mismatch false alert for lowmem mode. Reported-by: Marc MERLIN <marc@merlins.org> Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: lowmem check: Fix false alert about referencer count mismatchLu Fengqi2017-11-14
| | | | | | | | | | The normal back reference counting doesn't care about the extent referred by the extent data in the shared leaf. The check_extent_data_backref function need to skip the leaf that owner mismatch with the root_id. Reported-by: Marc MERLIN <marc@merlins.org> Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: lowmem check: Output more detailed information about file ↵Lu Fengqi2017-11-14
| | | | | | | | | | extent interrupt Make lowmem mode output more detailed information about file extent interrupt. Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: test: Add test image for lowmem mode file extent interruptLu Fengqi2017-11-14
| | | | | | | | Add a image that the inlined extent coexist with the regular extent. Reported-by: Marc MERLIN <marc@merlins.org> Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: docs: add note about mount option applicabilityDavid Sterba2017-11-14
| | | | | | Copied from https://btrfs.wiki.kernel.org/index.php/Mount_options . Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: docs: add impact of atime/noatimeDavid Sterba2017-11-14
| | | | | | | Copy from wiki https://btrfs.wiki.kernel.org/index.php?title=Mount_options Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: docs: update mount optionsDavid Sterba2017-11-14
| | | | | | Enhance the text, update for 4.14, sync with existing wiki page. Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: docs: correct grammarBenjamin Peterson2017-11-14
| | | | | Signed-off-by: Benjamin Peterson <bp@benjamin.pe> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: tests: extend fsck/028 to test fix-device-size and mountDavid Sterba2017-11-14
| | | | Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: tests/fsck: Add test case image for 'rescue fix-dev-size'Qu Wenruo2017-11-14
| | | | | | | | | | | | | | | | The image has 2 problems mixed: 1) Too small super total_bytes This super total_bytes is manually modified to create such problem. 2) Unaligned dev item total_bytes This is created by v4.12 kernel, with 128M + 2K device added, and original device removed. Then we can create such image with unaligned dev item total_bytes. Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: check: Also check and repair unaligned/mismatch device and ↵Qu Wenruo2017-11-14
| | | | | | | | | | | | | | | | | | | | | | | super sizes Along with the rescue introduced, also introduce check and repair for them. Unlike normal check functions, some of the check is optional, and even if the image failed to pass optional check, kernel can still runs fine. (But may cause noisy kernel warning) So some check, mainly for alignment, will not cause btrfs check to fail, but only to output warning and instructs how to fix it. For repair, it just calls the same repair function in rescue, and is included in 'btrfs check --repair'. But 'btrfs rescue' is still the preferred method, since it can be used independent of all the 'check' passes, if we know what's the exact problem to fix. Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: rescue: Introduce fix-device-sizeQu Wenruo2017-11-14
| | | | | | | | | | | | | Introduce new subcommand 'fix-device-size' to the rescue group, to fix device size alignment-related problems. Especially for people unable to mount their fs with super::total_bytes mismatch, this tool will fix the problems and let the mount continue. Reported-by: Asif Youssuff <yoasif@gmail.com> Reported-by: Rich Rauenzahn <rrauenza@gmail.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: Qu Wenruo <wqu@suse.com>
* btrfs-progs: Introduce function to fix super block total bytesQu Wenruo2017-11-14
| | | | | | | | | | | | | | | | | Recent kernel (starting from v4.6) will refuse to mount if super block total bytes is smaller than all devices' size. This makes end user unable to do anything to their otherwise quite healthy fs. To fix such problem, introduce repair function to fix it on an unmounted filesystem. Reported-by: Asif Youssuff <yoasif@gmail.com> Reported-by: Rich Rauenzahn <rrauenza@gmail.com> Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: Introduce function to fix unaligned device sizeQu Wenruo2017-11-14
| | | | | | | | | | | | | | | | Recent kernel introduced alignment check for dev item, however older kernel doesn't align device size when adding new device or shrinking existing device. This makes noisy kernel warning every time when any DEV_ITEM gets updated. Introduce function to fix device size on an unmounted filesystem. Reported-by: Asif Youssuff <yoasif@gmail.com> Reported-by: Rich Rauenzahn <rrauenza@gmail.com> Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: tests/common: Display warning only after searching for btrfs ↵Lakshmipathi.G2017-11-14
| | | | | | | kernel module Signed-off-by: Lakshmipathi.G <lakshmipathi.g@giis.co.in> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: tests: don't pass size to prepare_test_dev if not necessaryDavid Sterba2017-11-14
| | | | | | | Most tests don't need a specific size of the test device, the default 2GiB should be fine. Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: doc: add description of missing and example, of device removeMisono, Tomohiro2017-11-14
| | | | | | | | | | | | | | | | | This patch updates help/document of "btrfs device remove" in two points: 1. Add explanation of 'missing' for 'device remove'. This is only written in wikipage currently. (https://btrfs.wiki.kernel.org/index.php/Using_Btrfs_with_Multiple_Devices) 2. Add example of device removal in the man document. This is because that explanation of "remove" says "See the example section below", but there is no example of removal currently. Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> Reviewed-by: Satoru Takeuchi <satoru.takeuchi@gmail.com> [ move "" from the macro to help strings ] Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: device: add description of alias to help messageMisono, Tomohiro2017-11-14
| | | | | | | | State that the 'delete' is the alias of 'remove' as the man page says. Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> Reviewed-by: Satoru Takeuchi <satoru.takeuchi@gmail.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: don't use __u8 for fsid buffersDavid Sterba2017-11-14
| | | | | | | The underscore types are for ioctl structures and should not be used for regular code that does not need them. Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: fi: enable fi usage for filesystem on top of seed deviceMisono, Tomohiro2017-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently "fi usage" (and "dev usage") cannot run for the filesystem using the seed device. This is because FS_INFO ioctl returns the number of devices excluding seeds, but load_device_info() tries to access valid device from devid 0 to max_id, and results in accessing seeds too (thus causing mismatching number of devices). Since only the size of non-seed devices matters, fix this by just skipping seed device by checking device's fsid and comparing it to the fsid obtained by FS_INFO ioctl. Anand Jain: %fi_args.num_devices provides number of devices excluding the seed device. So when looping through the device list for a given fsid, determine if the given device is a seed device by reading its superblock and then skip it if its a seed device. Reading of the superblock is done by the function dev_to_fsid() which can fail if the user is not root OR if the device has media errors as well. So skip the seed check altogether if we fail to know the device superblock and thus the fsid. With this now we are able to view the btrfs fi usage when the device is bad. Signed-off-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> Reviewed-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: fi: move dev_to_fsid to cmds-fi-usage for later useMisono, Tomohiro2017-11-14
| | | | | | | | | Move dev_to_fsid() from cmds-filesystem.c to cmds-fi-usage.c in order to call it from both "fi show" and "fi usage". Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> Reviewed-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: rescue: Fix zero-log mounted branchQu Wenruo2017-11-14
| | | | | | | | | | | Seems to be a typo that, in (ret > 0) branch of check_mounted(), zero-log set the return value but doesn't return. Fix it by adding back the missing return. Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: qgroup: fix qgroup show sort by multi itemsLu Fengqi2017-11-14
| | | | | | | | | | | We should not free the string until we don't call strtok any longer. If the string is freed in advance, in fact, the second and subsequent sort items will be ignored. Fixes: 9fcdf8f8945b ("btrfs-progs: don't write to optarg in btrfs_qgroup_parse_sort_string") Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: mkfs: refactor test_minimum_size to use the calculated minimal sizeQu Wenruo2017-11-14
| | | | | | | | | | | | | | test_minimum_size() function is only called to check if provided device is large enough. However the minimal device size only needs to be calculated once, and can be reused everywhere. Refactor that function to make later modification easier. Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: convert: Open the fs readonly for rollbackQu Wenruo2017-11-14
| | | | | | | | | | | | | | | | For rollback, we only needs to open the fs to check if it meets the condition to rollback. And this RW read makes us failed to rollback btrfs with v2 space cache. In fact, we don't even start a transaction during rollback. So open the fs RO for rollback, to avoid v2 space cache problem. Reported-by: Gu Jinxiang <gujx@cn.fujitsu.com> Reviewed-by: Gu JinXiang <gujx@cn.fujitsu.com> Tested-by: Gu JinXiang <gujx@cn.fujitsu.com> Signed-off-by: Qu Wenruo <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: mkfs: error out gracefully for --rootdirQu Wenruo2017-11-14
| | | | | | | | | | | | | | | | | | | | | | | | --rootdir option will start a transaction to fill the fs, however if something goes wrong, from ENOSPC to lack of permission, we won't commit the transaction and cause BUG_ON triggered by uncommitted transaction: ------ extent buffer leak: start 29392896 len 16384 extent_io.c:579: free_extent_buffer: BUG_ON `eb->flags & EXTENT_DIRTY` triggered, value 1 ------ The root fix is to introduce btrfs_abort_transaction() in btrfs-progs, however in this particular case, we can workaround it by force committing the transaction. Since during mkfs, the magic of btrfs is set to an invalid one, without setting fs_info->finalize_on_close() the fs is never able to be mounted. So even we force to commit wrong transaction we won't screw up things worse. Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: mkfs: fix overwritten return value for mkfsQu Wenruo2017-11-14
| | | | | | | | | For mkfs failure, especially --rootdir errors like EPERM/ENOSPC, the out branch will overwrite the return value, causing wrong status code. Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: mkfs: avoid positive return value from cleanup_temp_chunksQu Wenruo2017-11-14
| | | | | | | | | | | | | Since we're calling btrfs_search_slot() the return value can be positive. However we just pass that return value out, causing undefined return value. This can cause mkfs to return 1, which indicates something wrong. Fix it. Signed-off-by: Qu Wenruo <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: mkfs: avoid BUG_ON for chunk allocation when ENOSPC happensQu Wenruo2017-11-14
| | | | | | | | | | | | | | | | | | | | | | | When passing directory larger than block device using --rootdir parameter, we get the following backtrace: ------ extent-tree.c:2693: btrfs_reserve_extent: BUG_ON `ret` triggered, value -28 ./mkfs.btrfs(+0x1a05d)[0x557939e6b05d] ./mkfs.btrfs(btrfs_reserve_extent+0xb5a)[0x557939e710c8] ./mkfs.btrfs(+0xb0b6)[0x557939e5c0b6] ./mkfs.btrfs(main+0x15d5)[0x557939e5de04] /usr/lib/libc.so.6(__libc_start_main+0xea)[0x7f83b101af6a] ./mkfs.btrfs(_start+0x2a)[0x557939e5af5a] ------ Nothing special, just BUG_ON() abusing from ancient code. Fix them by using correct return. Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: defrag: add a brief warning about ref-link breakagePavel Kretov2017-11-14
| | | | | | | | | | | | | | | | There is a warning in btrfs-filesystem(8) saying that running 'defrag' in Linux will almost certainly break ref-links, with much data potentially being physically duplicated. However, many users tend to read man pages *after* trying to run things on their own risk and may miss this important information. This commit adds a brief copy of this warning into the command built-in help message where it has good chances to be spotted before user is stuck with a crowded filesystem. Pull-request: #73 Signed-off-by: Pavel Kretov <firegurafiku@gmail.com> Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: image: move sanitization to new fileDavid Sterba2017-11-14
| | | | Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: image: pass sanitize mode and name tree separately to sanitize_nameDavid Sterba2017-11-14
| | | | | | Now sanitize_name and all callees do not depend on metadump_struct. Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: image: pass sanitize mode and name tree separately to ↵David Sterba2017-11-14
| | | | | | | | sanitize_dir_item We don't need the full mdrestore structure. Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: image: pass sanitize mode and name tree separately to ↵David Sterba2017-11-14
| | | | | | | | sanitize_inode_ref We don't need the full mdrestore structure. Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: image: drop unused parameter from sanitize_xattrDavid Sterba2017-11-14
| | | | Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: image: pass rb_root to find_collisionsDavid Sterba2017-11-14
| | | | | | We don't need the full metadump structure, pass only the name tree. Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: image: introduce symbolic names for the sanitization modesDavid Sterba2017-11-14
| | | | Signed-off-by: David Sterba <dsterba@suse.com>
* btrfs-progs: image: start a new header for sanitization functionsDavid Sterba2017-11-14
| | | | | | | Will be used by following cleanups, so far only the name structure could be moved here. Signed-off-by: David Sterba <dsterba@suse.com>