From: "Darrick J. Wong" <djwong@kernel.org>
To: Chandan Babu R <chandan.babu@oracle.com>
Cc: cem@kernel.org, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 04/24] metadump: Add initialization and release functions
Date: Tue, 23 May 2023 09:36:38 -0700 [thread overview]
Message-ID: <20230523163638.GK11620@frogsfrogsfrogs> (raw)
In-Reply-To: <20230523090050.373545-5-chandan.babu@oracle.com>
On Tue, May 23, 2023 at 02:30:30PM +0530, Chandan Babu R wrote:
> Move metadump initialization and release functionality into corresponding
> functions.
"No functional changes"?
> Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
> ---
> db/metadump.c | 88 ++++++++++++++++++++++++++++++---------------------
> 1 file changed, 52 insertions(+), 36 deletions(-)
>
> diff --git a/db/metadump.c b/db/metadump.c
> index 806cdfd68..e7a433c21 100644
> --- a/db/metadump.c
> +++ b/db/metadump.c
> @@ -2984,6 +2984,54 @@ done:
> return !write_buf(iocur_top);
> }
>
> +static int
> +init_metadump(void)
> +{
> + metadump.metablock = (xfs_metablock_t *)calloc(BBSIZE + 1, BBSIZE);
> + if (metadump.metablock == NULL) {
> + print_warning("memory allocation failure");
> + return -1;
> + }
> + metadump.metablock->mb_blocklog = BBSHIFT;
> + metadump.metablock->mb_magic = cpu_to_be32(XFS_MD_MAGIC);
> +
> + /* Set flags about state of metadump */
> + metadump.metablock->mb_info = XFS_METADUMP_INFO_FLAGS;
> + if (metadump.obfuscate)
> + metadump.metablock->mb_info |= XFS_METADUMP_OBFUSCATED;
> + if (!metadump.zero_stale_data)
> + metadump.metablock->mb_info |= XFS_METADUMP_FULLBLOCKS;
> + if (metadump.dirty_log)
> + metadump.metablock->mb_info |= XFS_METADUMP_DIRTYLOG;
> +
> + metadump.block_index = (__be64 *)((char *)metadump.metablock +
> + sizeof(xfs_metablock_t));
> + metadump.block_buffer = (char *)(metadump.metablock) + BBSIZE;
> + metadump.num_indices = (BBSIZE - sizeof(xfs_metablock_t)) / sizeof(__be64);
> +
> + /*
> + * A metadump block can hold at most num_indices of BBSIZE sectors;
> + * do not try to dump a filesystem with a sector size which does not
> + * fit within num_indices (i.e. within a single metablock).
> + */
> + if (mp->m_sb.sb_sectsize > metadump.num_indices * BBSIZE) {
> + print_warning("Cannot dump filesystem with sector size %u",
> + mp->m_sb.sb_sectsize);
> + free(metadump.metablock);
> + return -1;
> + }
> +
> + metadump.cur_index = 0;
> +
> + return 0;
Tabs, not spaces.
With that fixed,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> +}
> +
> +static void
> +release_metadump(void)
> +{
> + free(metadump.metablock);
> +}
> +
> static int
> metadump_f(
> int argc,
> @@ -3076,48 +3124,16 @@ metadump_f(
> pop_cur();
> }
>
> - metadump.metablock = (xfs_metablock_t *)calloc(BBSIZE + 1, BBSIZE);
> - if (metadump.metablock == NULL) {
> - print_warning("memory allocation failure");
> - return -1;
> - }
> - metadump.metablock->mb_blocklog = BBSHIFT;
> - metadump.metablock->mb_magic = cpu_to_be32(XFS_MD_MAGIC);
> -
> - /* Set flags about state of metadump */
> - metadump.metablock->mb_info = XFS_METADUMP_INFO_FLAGS;
> - if (metadump.obfuscate)
> - metadump.metablock->mb_info |= XFS_METADUMP_OBFUSCATED;
> - if (!metadump.zero_stale_data)
> - metadump.metablock->mb_info |= XFS_METADUMP_FULLBLOCKS;
> - if (metadump.dirty_log)
> - metadump.metablock->mb_info |= XFS_METADUMP_DIRTYLOG;
> -
> - metadump.block_index = (__be64 *)((char *)metadump.metablock +
> - sizeof(xfs_metablock_t));
> - metadump.block_buffer = (char *)metadump.metablock + BBSIZE;
> - metadump.num_indices = (BBSIZE - sizeof(xfs_metablock_t)) /
> - sizeof(__be64);
> -
> - /*
> - * A metadump block can hold at most num_indices of BBSIZE sectors;
> - * do not try to dump a filesystem with a sector size which does not
> - * fit within num_indices (i.e. within a single metablock).
> - */
> - if (mp->m_sb.sb_sectsize > metadump.num_indices * BBSIZE) {
> - print_warning("Cannot dump filesystem with sector size %u",
> - mp->m_sb.sb_sectsize);
> - free(metadump.metablock);
> + ret = init_metadump();
> + if (ret)
> return 0;
> - }
>
> start_iocur_sp = iocur_sp;
>
> if (strcmp(argv[optind], "-") == 0) {
> if (isatty(fileno(stdout))) {
> print_warning("cannot write to a terminal");
> - free(metadump.metablock);
> - return 0;
> + goto out;
> }
> /*
> * Redirect stdout to stderr for the duration of the
> @@ -3194,7 +3210,7 @@ metadump_f(
> while (iocur_sp > start_iocur_sp)
> pop_cur();
> out:
> - free(metadump.metablock);
> + release_metadump();
>
> return 0;
> }
> --
> 2.39.1
>
next prev parent reply other threads:[~2023-05-23 16:36 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 9:00 [PATCH 00/24] Metadump v2 Chandan Babu R
2023-05-23 9:00 ` [PATCH 01/24] metadump: Use boolean values true/false instead of 1/0 Chandan Babu R
2023-05-23 16:31 ` Darrick J. Wong
2023-05-23 9:00 ` [PATCH 02/24] mdrestore: Fix logic used to check if target device is large enough Chandan Babu R
2023-05-23 16:32 ` Darrick J. Wong
2023-05-23 9:00 ` [PATCH 03/24] metadump: Define and use struct metadump Chandan Babu R
2023-05-23 16:35 ` Darrick J. Wong
2023-05-24 4:50 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 04/24] metadump: Add initialization and release functions Chandan Babu R
2023-05-23 16:36 ` Darrick J. Wong [this message]
2023-05-24 5:03 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 05/24] set_cur: Add support to read from external log device Chandan Babu R
2023-05-23 16:48 ` Darrick J. Wong
2023-05-25 8:27 ` Chandan Babu R
2023-06-05 9:19 ` Chandan Babu R
2023-06-05 19:22 ` Darrick J. Wong
2023-06-06 4:47 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 06/24] metadump: Dump external log device contents Chandan Babu R
2023-05-23 17:02 ` Darrick J. Wong
2023-05-26 6:54 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 07/24] metadump: Postpone invocation of init_metadump() Chandan Babu R
2023-05-23 17:13 ` Darrick J. Wong
2023-05-25 8:45 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 08/24] metadump: Introduce struct metadump_ops Chandan Babu R
2023-05-23 17:15 ` Darrick J. Wong
2023-05-25 8:48 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 09/24] metadump: Introduce metadump v1 operations Chandan Babu R
2023-05-23 17:25 ` Darrick J. Wong
2023-05-25 14:19 ` Chandan Babu R
2023-06-02 14:34 ` Darrick J. Wong
2023-05-23 9:00 ` [PATCH 10/24] metadump: Rename XFS_MD_MAGIC to XFS_MD_MAGIC_V1 Chandan Babu R
2023-05-23 17:27 ` Darrick J. Wong
2023-05-23 9:00 ` [PATCH 11/24] metadump: Define metadump v2 ondisk format structures and macros Chandan Babu R
2023-05-23 17:34 ` Darrick J. Wong
2023-05-25 9:26 ` Chandan Babu R
2023-06-02 14:46 ` Darrick J. Wong
2023-05-23 9:00 ` [PATCH 12/24] metadump: Define metadump ops for v2 format Chandan Babu R
2023-05-23 17:37 ` Darrick J. Wong
2023-05-23 9:00 ` [PATCH 13/24] metadump: Add support for passing version option Chandan Babu R
2023-05-23 17:41 ` Darrick J. Wong
2023-05-23 9:00 ` [PATCH 14/24] xfs_metadump.sh: " Chandan Babu R
2023-05-23 17:39 ` Darrick J. Wong
2023-05-25 9:31 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 15/24] xfs_metadump.8: Add description for the newly introduced -v option Chandan Babu R
2023-05-23 17:40 ` Darrick J. Wong
2023-05-25 10:04 ` Chandan Babu R
2023-06-02 14:58 ` Darrick J. Wong
2023-05-23 9:00 ` [PATCH 16/24] mdrestore: Define and use struct mdrestore Chandan Babu R
2023-05-23 17:42 ` Darrick J. Wong
2023-05-26 8:38 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 17/24] mdrestore: Add open_device(), read_header() and show_info() functions Chandan Babu R
2023-05-23 17:44 ` Darrick J. Wong
2023-05-25 10:11 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 18/24] mdrestore: Introduce struct mdrestore_ops Chandan Babu R
2023-05-23 17:44 ` Darrick J. Wong
2023-05-25 10:34 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 19/24] mdrestore: Introduce mdrestore v1 operations Chandan Babu R
2023-05-23 17:48 ` Darrick J. Wong
2023-05-25 10:39 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 20/24] mdrestore: Detect metadump version from metadump image Chandan Babu R
2023-05-23 18:11 ` Darrick J. Wong
2023-05-23 9:00 ` [PATCH 21/24] mdrestore: Extract target device size verification into a function Chandan Babu R
2023-05-23 18:07 ` Darrick J. Wong
2023-05-25 12:02 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 22/24] mdrestore: Define mdrestore ops for v2 format Chandan Babu R
2023-05-23 18:06 ` Darrick J. Wong
2023-05-25 12:10 ` Chandan Babu R
2023-06-02 15:01 ` Darrick J. Wong
2023-05-23 9:00 ` [PATCH 23/24] mdrestore: Add support for passing log device as an argument Chandan Babu R
2023-05-23 18:09 ` Darrick J. Wong
2023-05-25 13:43 ` Chandan Babu R
2023-06-02 15:02 ` Darrick J. Wong
2023-06-05 6:19 ` Chandan Babu R
2023-05-23 9:00 ` [PATCH 24/24] xfs_mdrestore.8: Add description for the newly introduced -l option Chandan Babu R
2023-05-23 18:10 ` Darrick J. Wong
2023-05-25 13:45 ` Chandan Babu R
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=20230523163638.GK11620@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=cem@kernel.org \
--cc=chandan.babu@oracle.com \
--cc=linux-xfs@vger.kernel.org \
/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