From: Sidong Yang <realwakka@gmail.com>
To: linux-btrfs <linux-btrfs@vger.kernel.org>
Cc: Sidong Yang <realwakka@gmail.com>
Subject: [PATCH v2] btrfs-progs: balance: print warn mesg in old command
Date: Sun, 31 Oct 2021 13:10:11 +0000 [thread overview]
Message-ID: <20211031131011.42401-1-realwakka@gmail.com> (raw)
This patch makes old balance command to print warning message same as
in start command. It makes do_balance() checks flags that needs to
print warning message. It works in old command because old command also
uses do_balance().
Issue: #411
Signed-off-by: Sidong Yang <realwakka@gmail.com>
---
v2:
- Prints warning message in do_balance()
---
cmds/balance.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/cmds/balance.c b/cmds/balance.c
index 7abc69d9..2e903b5c 100644
--- a/cmds/balance.c
+++ b/cmds/balance.c
@@ -322,6 +322,24 @@ static int do_balance(const char *path, struct btrfs_ioctl_balance_args *args,
return 1;
}
+ if (!(flags & BALANCE_START_FILTERS) && !(flags & BALANCE_START_NOWARN)) {
+ int delay = 10;
+
+ printf("WARNING:\n\n");
+ printf("\tFull balance without filters requested. This operation is very\n");
+ printf("\tintense and takes potentially very long. It is recommended to\n");
+ printf("\tuse the balance filters to narrow down the scope of balance.\n");
+ printf("\tUse 'btrfs balance start --full-balance' option to skip this\n");
+ printf("\twarning. The operation will start in %d seconds.\n", delay);
+ printf("\tUse Ctrl-C to stop it.\n");
+ while (delay) {
+ printf("%2d", delay--);
+ fflush(stdout);
+ sleep(1);
+ }
+ printf("\nStarting balance without any filters.\n");
+ }
+
ret = ioctl(fd, BTRFS_IOC_BALANCE_V2, args);
if (ret < 0) {
/*
@@ -547,24 +565,6 @@ static int cmd_balance_start(const struct cmd_struct *cmd,
printf("\nStarting conversion to RAID5/6.\n");
}
- if (!(start_flags & BALANCE_START_FILTERS) && !(start_flags & BALANCE_START_NOWARN)) {
- int delay = 10;
-
- printf("WARNING:\n\n");
- printf("\tFull balance without filters requested. This operation is very\n");
- printf("\tintense and takes potentially very long. It is recommended to\n");
- printf("\tuse the balance filters to narrow down the scope of balance.\n");
- printf("\tUse 'btrfs balance start --full-balance' option to skip this\n");
- printf("\twarning. The operation will start in %d seconds.\n", delay);
- printf("\tUse Ctrl-C to stop it.\n");
- while (delay) {
- printf("%2d", delay--);
- fflush(stdout);
- sleep(1);
- }
- printf("\nStarting balance without any filters.\n");
- }
-
if (force)
args.flags |= BTRFS_BALANCE_FORCE;
if (bconf.verbose > BTRFS_BCONF_QUIET)
--
2.25.1
next reply other threads:[~2021-10-31 13:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-31 13:10 Sidong Yang [this message]
2021-11-01 11:35 ` [PATCH v2] btrfs-progs: balance: print warn mesg in old command Qu Wenruo
2021-11-02 17:02 ` David Sterba
2021-11-05 8:05 ` Wang Yugui
2021-11-05 11:50 ` David Sterba
2021-11-06 6:03 ` Sidong Yang
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=20211031131011.42401-1-realwakka@gmail.com \
--to=realwakka@gmail.com \
--cc=linux-btrfs@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