On 18.10.2017 11:00, Qu Wenruo wrote: > First 3 patches are small bug fixes which can be applied even we don't > touch the functionality of --rootdir. > > The last two patches will refactor --rootdir related functions (mainly > size_sourcedir and make_image) to mkfs/rootdir.[ch]. > And rename them to btrfs_mkfs_size_dir() and btrfs_mkfs_fill_dir() > respectively. > Functionality is not changed at all, so it will still shrink the device > or using the first 1M reserved space. > > This moved about 700 lines, which reduced about 1/3 of original mkfs.c. > > And by moving this ancient code to its own files, I also fixed several > small nits exposed by checkpatch script. > > This provides a clean environment for later rootdir rework. > > Qu Wenruo (5): > btrfs-progs: Avoid BUG_ON for chunk allocation when ENOSPC happens > btrfs-progs: mkfs: Fix overwritten return value for mkfs > btrfs-progs: mkfs: Error out gracefully for --rootdir > btrfs-progs: mkfs: Move image creation of rootdir to its own files > btrfs-progs: mkfs: Move source dir size calculation to its own files
Reviewed-by: Nikolay Borisov <nbori...@suse.com> > > Makefile | 4 +- > extent-tree.c | 3 +- > mkfs/main.c | 710 +------------------------------------------------------ > mkfs/rootdir.c | 735 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > mkfs/rootdir.h | 32 +++ > volumes.c | 18 +- > 6 files changed, 792 insertions(+), 710 deletions(-) > create mode 100644 mkfs/rootdir.c > create mode 100644 mkfs/rootdir.h > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html