From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.cz, nborisov@suse.com
Subject: [PATCH v2 0/6] Rootdir refactor and small bug fixes
Date: Thu, 19 Oct 2017 13:41:32 +0800 [thread overview]
Message-ID: <20171019054138.13965-1-wqu@suse.com> (raw)
Sorry for the v2 patchset, just added a new 3-line patch.
But since it can screw up bisect, I re-send the whole patchset, to make
the new patch just before mkfs return value fix, so bisect will work as
it used to do.
First 4 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.
changelog:
v2:
Add a new fix, to avoid mkfs return 1. The rest doesn't change.
Add reviewed-by tag.
Qu Wenruo (6):
btrfs-progs: Avoid BUG_ON for chunk allocation when ENOSPC happens
btrfs-progs: mkfs: Avoid positive return value from
cleanup_temp_chunks
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
Makefile | 4 +-
extent-tree.c | 3 +-
mkfs/main.c | 713 +------------------------------------------------------
mkfs/rootdir.c | 735 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mkfs/rootdir.h | 32 +++
volumes.c | 18 +-
6 files changed, 795 insertions(+), 710 deletions(-)
create mode 100644 mkfs/rootdir.c
create mode 100644 mkfs/rootdir.h
--
2.14.2
next reply other threads:[~2017-10-19 5:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-19 5:41 Qu Wenruo [this message]
2017-10-19 5:41 ` [PATCH v2 1/6] btrfs-progs: Avoid BUG_ON for chunk allocation when ENOSPC happens Qu Wenruo
2017-10-19 5:41 ` [PATCH v2 2/6] btrfs-progs: mkfs: Avoid positive return value from cleanup_temp_chunks Qu Wenruo
2017-10-19 5:41 ` [PATCH v2 3/6] btrfs-progs: mkfs: Fix overwritten return value for mkfs Qu Wenruo
2017-10-19 5:41 ` [PATCH v2 4/6] btrfs-progs: mkfs: Error out gracefully for --rootdir Qu Wenruo
2017-10-19 5:41 ` [PATCH v2 5/6] btrfs-progs: mkfs: Move image creation of rootdir to its own files Qu Wenruo
2017-10-26 17:05 ` David Sterba
2017-10-19 5:41 ` [PATCH v2 6/6] btrfs-progs: mkfs: Move source dir size calculation " Qu Wenruo
2017-10-26 17:13 ` [PATCH v2 0/6] Rootdir refactor and small bug fixes David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171019054138.13965-1-wqu@suse.com \
--to=wqu@suse.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=nborisov@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).