summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* btrfs-progs: make libbtrfs usable from C++Arvin Schnell2013-02-19
| | | | | | | | Please find attached a patch to make the new libbtrfs usable from C++ (at least for the parts snapper will likely need). Signed-off-by: Arvin Schnell <aschnell@suse.de> Signed-off-by: Mark Fasheh <mfasheh@suse.de>
* Btrfs-progs: make 0 a valid usage filter argumentIlya Dryomov2013-02-13
| | | | | | | | This is a progs counterpart to a "Btrfs: allow for selecting only completely empty chunks". usage=0 now means "select only only completely empty chunks and nothing else". Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
* btrfs-progs: add send-testMark Fasheh2013-02-13
| | | | | | | | send-test.c links against libbtrfs and uses the send functionality provided to decode and print a send stream to the console. Signed-off-by: Mark Fasheh <mfasheh@suse.de> Signed-off-by: David Sterba <dsterba@suse.cz>
* btrfs-progs: Add support for BTRFS_SEND_FLAG_NO_FILE_DATAMark Fasheh2013-02-12
| | | | | | | | | | | The flag and command are synced from kernel to user. Also, this patch adds a callback for the BTRFS_SEND_C_UPDATE_EXTENT in struct btrfs_send_ops. read_and_process_cmd() is updated to decode BTRFS_SEND_C_UPDATE_EXTENT and send the values through the right callback. I did not add a callback definition to cmds-receive.c as that code never uses BTRFS_SEND_FLAG_NO_FILE_DATA. Signed-off-by: Mark Fasheh <mfasheh@suse.de>
* Btrfs-progs: add restore command to btrfsIan Kumlien2013-02-12
| | | | | | | | Add 'btrfs restore' command which previously existed as a separate utility btrfs-restore. Signed-off-by: Ian Kumlien <pomac@demius.net> Signed-off-by: David Sterba <dsterba@suse.cz>
* Btrfs-progs: restore.c -> cmds-restore.cIan Kumlien2013-02-12
| | | | | | | The btrfs-restore functionality will be integrated in btrs as "btrfs restore" Signed-off-by: Ian Kumlien <pomac@demius.net>
* btrfs-progs: build btrsfck to keep compatibilityDavid Sterba2013-02-12
| | | | | | | The command 'btrfsck' is commonly used and we should build it by default. Signed-off-by: David Sterba <dsterba@suse.cz>
* Btrfs-progs: add btrfsck name detection to btrfsIlya Dryomov2013-02-12
| | | | | | | | | | This patch adds a busybox-style name detection for the name "btrfsck" to btrfs utility. The idea is to maintain backwards compatibility by linking btrfsck to btrfs and have btrfs invoke the check sub-command when called through the btrfsck link. This has been suggested on the mailing list and approved by Dave and Chris. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
* Btrfs-progs: move crc32c optimization initIlya Dryomov2013-02-12
| | | | | | | Don't call crc32c_optimization_init() until we know that a command is actually going to be invoked. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
* Btrfs-progs: add btrfsck functionality to btrfsIan Kumlien2013-02-12
| | | | | | | | This patch includes the functionality of btrfs, it's found as "btrfs check". Signed-off-by: Ian Kumlien <pomac@demius.net> Signed-off-by: David Sterba <dsterba@suse.cz>
* Btrfs-progs: Rename btrfsck.c -> cmds-check.cIan Kumlien2013-02-12
| | | | | | In preparation for merging btrfsck functionality in to btrfs. Signed-off-by: Ian Kumlien <pomac@demius.net>
* Btrfs-progs: -U_FORTIFY_SOURCE before -DIan Kumlien2013-02-12
| | | | | | | | | | My builds are cluttered with: <command-line>:0:0: warning: "_FORTIFY_SOURCE" redefined [enabled by default] Which makes it hard to tell if something breaks or not. Signed-off-by: Ian Kumlien <pomac@demius.net>
* Btrfs-progs: add static compile targetIan Kumlien2013-02-12
| | | | | | | | | | | | | | Sometimes, when you least expect it, a static binary is what you need to rescue your data... Or just get a good enough handle on things to make it work again ;) "make static" is a gift to you, dear user with filesystem problems! Anyway, on a more serious note, changed the cflags and ldflags so that we create a smaller binary, 1.1MB stripped on my 64 bit system (2.7MB with debug data) Signed-off-by: Ian Kumlien <pomac@demius.net>
* btrfs-progs: code cleanup for root-tree.c/btrfs_del_rootWang Sheng-Hui2013-02-07
| | | | | | | Remove the redundant if check on the condition ret > 0. Leave BUG_ON check here. Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>
* Btrfs-progs: return an error if we can't find an fs rootJosef Bacik2013-02-07
| | | | | | | | | | | Instead of doing a BUG_ON() if we fail to find the last fs root just return an error so the callers can deal with it how they like. Also we need to actually return an error if we can't find the latest root so that the error handling works. With this btrfsck was able to deal with a file system that was missing a root item but still had extents that referred back to the root. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com>
* Btrfs-progs: fix double free of extent bufferJosef Bacik2013-02-07
| | | | | | | Noticed this while looking for an segfault related to our eb cache in btrfsck. We free the eb in out: so we don't need this extra free. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com>
* Btrfs-progs: handle errors reading fs rootsJosef Bacik2013-02-07
| | | | | | | | | | A user had a problem where btrfsck would bail out because it was finding extents for a snapshot that had been deleted but not entirely cleaned up. We can handle this case fine, we just need to report an error properly. This patch allowed btrfsck to continue and eventually fix his file system. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com>
* btrfs-progs: remove unused bit-radix.[ch] filesEric Sandeen2013-02-07
| | | | | | | fd53de4d Drop bit-radix.[ch] files removed the files from the Makefile, but not the files themselves. Signed-off-by: Eric Sandeen <sandeen@redhat.com>
* Btrfs-progs print more informative error when we fail to open a deviceEric Sandeen2013-02-06
| | | | | | | | | print more informative error when we fail to open a device If open() fails, we should let the user know why it failed. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Gene Czarcinski <gene@czarc.net>
* Merge branch 'cov-fixes-v1-integration-20130201' of ↵Chris Mason2013-02-06
|\ | | | | | | http://git.zabbo.net/cgit/btrfs-progs into merged
| * btrfs-progs: initialize pipefd[] for error pathEric Sandeen2013-02-05
| | | | | | | | | | | | | | | | | | | | | | Several goto out; paths will end up doing i.e. if (pipefd[0]) close(pipefd[0]); but we get there with uninitialized values in many cases. Signed-off-by: Eric Sandeen <sandeen@redhat.com>
| * btrfs-progs: fix overflows of ioctl name argsEric Sandeen2013-02-05
| | | | | | | | | | | | | | | | | | 3 places where we copy pathnames into ioctl arguments were not limited to the destination name size, and could overflow. Use the new strncpy_null() macro to make this safe. Signed-off-by: Eric Sandeen <sandeen@redhat.com>
| * btrfs-progs: simplify ioctl name copy and null terminationEric Sandeen2013-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the places where we copy a string into the name member of btrfs_ioctl_vol_args or btrfs_ioctl_vol_args_v2, we use strncopy (to not overflow the name array) and then set the last position to the null character. Howver, in both cases the arrays are defined with: char name[MAX+1]; hence the last array position is name[MAX]. In most cases, we now insert the null at name[MAX-1] which deprives us of one useful character. Even the above isn't consistent through the code, so make some helper code to make it simple, i.e. strncpy_null(dest, src) which automatically does the right thing based on the size of dest. Thanks to Zach Brown for the macro suggestion. Signed-off-by: Eric Sandeen <sandeen@redhat.com>
| * btrfs-progs: fix name lengths in cmd_subvol_createEric Sandeen2013-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | cmd_subvol_create() calls either BTRFS_IOC_SUBVOL_CREATE or BTRFS_IOC_SUBVOL_CREATE_V2 depending on whether or not inherit is set. However, these 2 ioctls have different args structures with different length name[] members. In the BTRFS_IOC_SUBVOL_CREATE case, the arg is btrfs_ioctl_vol_args, with a BTRFS_PATH_NAME_MAX length name, not a BTRFS_SUBVOL_NAME_MAX length name. Signed-off-by: Eric Sandeen <sandeen@redhat.com>
| * btrfs-progs: remove duplicate __setup_rootEric Sandeen2013-02-05
| | | | | | | | | | | | | | | | | | __setup_root() was present in find-root.c as well as disk-io.c. No need for the cut and paste, just use the one in disk-io.c Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: fix mdresotre typo in function namesEric Sandeen2013-02-05
| | | | | | | | | | | | | | | | "mdresotre" sounds like it might be French, but most likely it's a misspelling of mdrestore. Fix it. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: zero out inspect ioctl argsEric Sandeen2013-02-05
| | | | | | | | | | | | | | | | Mostly just to keep things like coverity happy about potentially uninitialized structure members, since it doesn't grok the ioctl. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: don't use closed fdEric Sandeen2013-02-05
| | | | | | | | | | | | | | | | | | | | In the case that btrfs scrub cancel is given a device name, we close the file handle, and then pass it to check_mounted_where() which eventually preads from that (now closed) fd. Fix the logic so that we close & re-open the discovered mountpoint properly. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: don't double-close prg_fdEric Sandeen2013-02-05
| | | | | | | | | | | | | | | | | | If scrub start discovers that scrub is already running, we need to set prg_fd to -1 before goto out, or we'll try to close it again in the error path. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: don't leak fds in logical resolveZach Brown2013-02-05
| | | | | | | | Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: close fd in inode resolveZach Brown2013-02-05
| | | | | | | | Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: don't leak multi-bio in find_root()Zach Brown2013-02-05
| | | | | | | | | | | | It wasn't freed if it didn't find metadata. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: don't leak inherit on errorsZach Brown2013-02-05
| | | | | | | | | | | | A few paths returned errors before freeing their inherit allocation. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: close ioctl fd in find newZach Brown2013-02-05
| | | | | | | | Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: don't leak fd in resizeZach Brown2013-02-05
| | | | | | | | | | | | | | Argument validation failed to close the fd that was opened. So check the arguments before opening anything. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: free path before returningZach Brown2013-02-05
| | | | | | | | | | | | | | One of the return statements in search_dir() didn't free everything it was supposed to. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: close fd in qgroup showZach Brown2013-02-05
| | | | | | | | | | | | It wasn't closed in the error path. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: free bits in check_extents()Zach Brown2013-02-05
| | | | | | | | | | | | As far as I can tell, nothing took the address of this. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: remove unused argumentsZach Brown2013-02-05
| | | | | | | | | | | | add_root_to_pending() took a bunch of arguments that it never used. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: scrub can leak fd 0Zach Brown2013-02-05
| | | | | | | | | | | | < 0 is returned for errors opening the file, this code could leak fd 0. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: fix scrub socket leakZach Brown2013-02-05
| | | | | | | | | | | | | | | | If connection fails the socket is leaked when the status file is used instead. Close it to trivially cut down on fd use and to bring down the noise in static code analysis. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: don't leak in set_extent_bitsZach Brown2013-02-05
| | | | | | | | | | | | | | | | | | | | It looks possible to hit the search_again label without using the prealloc. A new prealloc is allocated, leaking the current one. Every use of prealloc sets it to null so let's just allocate a new prealloc when we don't already have one. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: fix overflow in btrfs_scan_one_dir()Zach Brown2013-02-05
| | | | | | | | | | | | | | | | | | | | | | btrfs_scan_one_dir() can overflow an arbitrarily small 256 byte buffer with an arbitrarily slightly larger 1024 byte buffer as it remembers the path of a dir to later descend. Make these buffers the same size to stop the overflow and chose PATH_MAX for that size so that it won't fail on legitimately bonkers paths. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: free path on read_chunk_tree errorZach Brown2013-02-05
| | | | | | | | | | | | | | Path allocation failure already has its own return, remember to free the path when the error label is taken. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: array indexes must be < ARRAY_SIZE()Zach Brown2013-02-05
| | | | | | | | | | | | | | It looks like the usual kernel idiom of "< ARRAY_SIZE()" was accidentally negated as ">" instead of ">=". Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: don't write memory after sb to diskZach Brown2013-02-05
| | | | | | | | | | | | | | | | | | | | struct btrfs_super is about 3.5k but a few writing paths were writing it out as the full 4k BTRFS_SUPER_INFO_SIZE, leaking a few hundred bytes after the super_block onto disk. In practice this meant the memory after super_copy in struct btrfs_fs_info and whatever came after it in the heap. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: impossible BUG_ON meant to test emptyZach Brown2013-02-05
| | | | | | | | | | | | | | | | old_left_nritems is unsigned so BUG_ON(old_left_nritems < 0) is impossible. Presumably the BUG_ON() meant to test that it wasn't 0 so that btrfs_item_offset_nr() doesn't get a nr of -1. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: check for open failure, don't closeZach Brown2013-02-05
| | | | | | | | | | | | | | Check for failure by testing for a negative file descriptor, not a descriptor of 0. And if it failed we have nothing to close(). Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: don't close(<0) in subvol createZach Brown2013-02-05
| | | | | | | | | | | | | | Don't try to close an fd immediately after discovering that opening it failed. Signed-off-by: Zach Brown <zab@redhat.com>
| * btrfs-progs: don't return -EBUSY from main()Zach Brown2013-02-05
| | | | | | | | | | | | | | -EBUSY is platform dependent and is even less reliable when truncated to a u8. Just return 1 on error. Signed-off-by: Zach Brown <zab@redhat.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 14:37:16 +0000