From patchwork Fri Mar 20 03:32:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 11448333 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5E590913 for ; Fri, 20 Mar 2020 03:29:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 347B320714 for ; Fri, 20 Mar 2020 03:29:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=mpdesouza.com header.i=@mpdesouza.com header.b="FbpTSJ/b" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726916AbgCTD3m (ORCPT ); Thu, 19 Mar 2020 23:29:42 -0400 Received: from gateway31.websitewelcome.com ([192.185.144.95]:31242 "EHLO gateway31.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726103AbgCTD3m (ORCPT ); Thu, 19 Mar 2020 23:29:42 -0400 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway31.websitewelcome.com (Postfix) with ESMTP id A237460779 for ; Thu, 19 Mar 2020 22:29:40 -0500 (CDT) Received: from br540.hostgator.com.br ([108.179.252.180]) by cmsmtp with SMTP id F8LsjX5KvVQh0F8Lsjm2CR; Thu, 19 Mar 2020 22:29:40 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mpdesouza.com; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=lYOtt7KGHO960OWZ5UfHWWk3prAlToez2yvjevkz3I0=; b=FbpTSJ/b1sWn0LcV0flguzu+O9 I1MCXbEMR0+KIDDRbzRsqMBT0G/50IJDQVPqeXNv0IIUqDxvqy5syCTb5fk4ufXAN4JiV5cRFSl0N Hb4w0fcOpoeThRDyJMBDsO/XUdSTf/sjrKPUWeYVKTZ5Tk+Is22Y57XZoA+aX4OUBYOTjiiC6Yei5 4e0nJELG91ouxchIsdrYs4/jfM7aMGUWIEViywEC8w7UV0FxHn4X1r+K3GD5fTeOs/0jMPmWlk5EO Qu+rMoXzPGMEDS/fDHVT41pNA1zTl8CPDygaDaApE1lIOF3NtrexZTIXhYPjVppypcS88NLb84djS T83Mh2CA==; Received: from [191.249.66.103] (port=39060 helo=hephaestus.prv.suse.net) by br540.hostgator.com.br with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92) (envelope-from ) id 1jF8Ls-0023Ig-0x; Fri, 20 Mar 2020 00:29:40 -0300 From: Marcos Paulo de Souza To: dsterba@suse.com, wqu@suse.com, linux-btrfs@vger.kernel.org Cc: Marcos Paulo de Souza Subject: [PATCHv2 1/2] btrfs-progs: Move resize into functionaly into utils.c Date: Fri, 20 Mar 2020 00:32:26 -0300 Message-Id: <20200320033227.3721-2-marcos@mpdesouza.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200320033227.3721-1-marcos@mpdesouza.com> References: <20200320033227.3721-1-marcos@mpdesouza.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - br540.hostgator.com.br X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - mpdesouza.com X-BWhitelist: no X-Source-IP: 191.249.66.103 X-Source-L: No X-Exim-ID: 1jF8Ls-0023Ig-0x X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (hephaestus.prv.suse.net) [191.249.66.103]:39060 X-Source-Auth: marcos@mpdesouza.com X-Email-Count: 6 X-Source-Cap: bXBkZXNvNTM7bXBkZXNvNTM7YnI1NDAuaG9zdGdhdG9yLmNvbS5icg== X-Local-Domain: yes Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Marcos Paulo de Souza This function will be used in the next patch to auto resize the filesystem when a bigger disk is added. Signed-off-by: Marcos Paulo de Souza --- cmds/filesystem.c | 58 ++------------------------------------------- common/utils.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ common/utils.h | 1 + 3 files changed, 63 insertions(+), 56 deletions(-) diff --git a/cmds/filesystem.c b/cmds/filesystem.c index 4f22089a..9d31f236 100644 --- a/cmds/filesystem.c +++ b/cmds/filesystem.c @@ -1074,11 +1074,7 @@ static const char * const cmd_filesystem_resize_usage[] = { static int cmd_filesystem_resize(const struct cmd_struct *cmd, int argc, char **argv) { - struct btrfs_ioctl_vol_args args; - int fd, res, len, e; - char *amount, *path; - DIR *dirstream = NULL; - struct stat st; + char *amount, *path; clean_args_no_options_relaxed(cmd, argc, argv); @@ -1088,57 +1084,7 @@ static int cmd_filesystem_resize(const struct cmd_struct *cmd, amount = argv[optind]; path = argv[optind + 1]; - len = strlen(amount); - if (len == 0 || len >= BTRFS_VOL_NAME_MAX) { - error("resize value too long (%s)", amount); - return 1; - } - - res = stat(path, &st); - if (res < 0) { - error("resize: cannot stat %s: %m", path); - return 1; - } - if (!S_ISDIR(st.st_mode)) { - error("resize works on mounted filesystems and accepts only\n" - "directories as argument. Passing file containing a btrfs image\n" - "would resize the underlying filesystem instead of the image.\n"); - return 1; - } - - fd = btrfs_open_dir(path, &dirstream, 1); - if (fd < 0) - return 1; - - printf("Resize '%s' of '%s'\n", path, amount); - memset(&args, 0, sizeof(args)); - strncpy_null(args.name, amount); - res = ioctl(fd, BTRFS_IOC_RESIZE, &args); - e = errno; - close_file_or_dir(fd, dirstream); - if( res < 0 ){ - switch (e) { - case EFBIG: - error("unable to resize '%s': no enough free space", - path); - break; - default: - error("unable to resize '%s': %m", path); - break; - } - return 1; - } else if (res > 0) { - const char *err_str = btrfs_err_str(res); - - if (err_str) { - error("resizing of '%s' failed: %s", path, err_str); - } else { - error("resizing of '%s' failed: unknown error %d", - path, res); - } - return 1; - } - return 0; + return resize_filesystem(amount, path); } static DEFINE_SIMPLE_COMMAND(filesystem_resize, "resize"); diff --git a/common/utils.c b/common/utils.c index 4ce36836..dddf0a6f 100644 --- a/common/utils.c +++ b/common/utils.c @@ -461,6 +461,66 @@ int pretty_size_snprintf(u64 size, char *str, size_t str_size, unsigned unit_mod return snprintf(str, str_size, "%.2f%s", fraction, suffix[num_divs]); } +int resize_filesystem(const char *amount, const char *path) +{ + struct btrfs_ioctl_vol_args args; + int fd, res, len, e; + DIR *dirstream = NULL; + struct stat st; + + len = strlen(amount); + if (len == 0 || len >= BTRFS_VOL_NAME_MAX) { + error("resize value too long (%s)", amount); + return 1; + } + + res = stat(path, &st); + if (res < 0) { + error("resize: cannot stat %s: %m", path); + return 1; + } + if (!S_ISDIR(st.st_mode)) { + error("resize works on mounted filesystems and accepts only\n" + "directories as argument. Passing file containing a btrfs image\n" + "would resize the underlying filesystem instead of the image.\n"); + return 1; + } + + fd = btrfs_open_dir(path, &dirstream, 1); + if (fd < 0) + return 1; + + printf("Resize '%s' of '%s'\n", path, amount); + memset(&args, 0, sizeof(args)); + strncpy_null(args.name, amount); + res = ioctl(fd, BTRFS_IOC_RESIZE, &args); + e = errno; + close_file_or_dir(fd, dirstream); + if( res < 0 ){ + switch (e) { + case EFBIG: + error("unable to resize '%s': no enough free space", + path); + break; + default: + error("unable to resize '%s': %m", path); + break; + } + return 1; + } else if (res > 0) { + const char *err_str = btrfs_err_str(res); + + if (err_str) { + error("resizing of '%s' failed: %s", path, err_str); + } else { + error("resizing of '%s' failed: unknown error %d", + path, res); + } + return 1; + } + return 0; +} + /* * Checks to make sure that the label matches our requirements. * Returns: diff --git a/common/utils.h b/common/utils.h index 5c1afda9..8609d3c9 100644 --- a/common/utils.h +++ b/common/utils.h @@ -62,6 +62,7 @@ int check_mounted_where(int fd, const char *file, char *where, int size, struct btrfs_fs_devices **fs_devices_mnt, unsigned sbflags); int pretty_size_snprintf(u64 size, char *str, size_t str_bytes, unsigned unit_mode); +int resize_filesystem(const char *amount, const char *path); #define pretty_size(size) pretty_size_mode(size, UNITS_DEFAULT) const char *pretty_size_mode(u64 size, unsigned mode); From patchwork Fri Mar 20 03:32:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 11448335 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0A1D51874 for ; Fri, 20 Mar 2020 03:29:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DDC8820724 for ; Fri, 20 Mar 2020 03:29:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=mpdesouza.com header.i=@mpdesouza.com header.b="Tv/l/Wcx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727048AbgCTD3o (ORCPT ); Thu, 19 Mar 2020 23:29:44 -0400 Received: from gateway30.websitewelcome.com ([192.185.197.25]:18107 "EHLO gateway30.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726103AbgCTD3n (ORCPT ); Thu, 19 Mar 2020 23:29:43 -0400 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway30.websitewelcome.com (Postfix) with ESMTP id 4333A27FB for ; Thu, 19 Mar 2020 22:29:42 -0500 (CDT) Received: from br540.hostgator.com.br ([108.179.252.180]) by cmsmtp with SMTP id F8LujQhFlXVkQF8LujhlTh; Thu, 19 Mar 2020 22:29:42 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mpdesouza.com; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Y6uj2Arc6Jv66n5a65JZRSK32idgjM4QgUN2ISLmWZc=; b=Tv/l/WcxW6Hf2nH3mAPLaAmgZe KjWmTm3MwG4McnNmqwd9YwWPFur1+OJld3iqL/7RD8loRGY6zoFhnPeQiBYeQYiWterpJoca5Zx0U 4rh+74yohPAhMgmrnkaA9vxjKIbkBCvIvIbQfYInlgb8hgQgmtr0BjRCjTXVk275KayK5Fz1kFfuw i3PPdD829Xuybacv5SQgseZiZnkILw//nzKMTk0Ujj8FbyZqkoszWEoZ9SpesEtf18fVmozr9bxKK 2WxvFLp5g9A+9V1zxVEuDGTtl1hByN4RA75ivDHKUuKMwm2I6BqZ2gTiMfWkqSQIdjJ9jCIsTz/DL 6Nyn3QfQ==; Received: from [191.249.66.103] (port=39060 helo=hephaestus.prv.suse.net) by br540.hostgator.com.br with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92) (envelope-from ) id 1jF8Lt-0023Ig-LT; Fri, 20 Mar 2020 00:29:42 -0300 From: Marcos Paulo de Souza To: dsterba@suse.com, wqu@suse.com, linux-btrfs@vger.kernel.org Cc: Marcos Paulo de Souza Subject: [PATCHv2 2/2] btrfs-progs: replace: New argument to resize the fs after replace Date: Fri, 20 Mar 2020 00:32:27 -0300 Message-Id: <20200320033227.3721-3-marcos@mpdesouza.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200320033227.3721-1-marcos@mpdesouza.com> References: <20200320033227.3721-1-marcos@mpdesouza.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - br540.hostgator.com.br X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - mpdesouza.com X-BWhitelist: no X-Source-IP: 191.249.66.103 X-Source-L: No X-Exim-ID: 1jF8Lt-0023Ig-LT X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (hephaestus.prv.suse.net) [191.249.66.103]:39060 X-Source-Auth: marcos@mpdesouza.com X-Email-Count: 10 X-Source-Cap: bXBkZXNvNTM7bXBkZXNvNTM7YnI1NDAuaG9zdGdhdG9yLmNvbS5icg== X-Local-Domain: yes Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Marcos Paulo de Souza By using the -a flag on replace makes btrfs issue a resize ioctl after the replace finishes. This argument is a shortcut for btrfs replace start -f 3 /dev/sdf BTRFS/ btrfs fi resize 3:max BTRFS/ The -a stands for "automatically resize" Fixes: #21 Signed-off-by: Marcos Paulo de Souza --- Changes from v1: * Reworded the help message and the docs telling the user that the fs will be resized to it's max size (suggested by Wenruo) * Added a warning message saying that the resize failed, asking the user to resize manually. (suggested by Wenruo) Documentation/btrfs-replace.asciidoc | 5 ++++- cmds/replace.c | 21 +++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Documentation/btrfs-replace.asciidoc b/Documentation/btrfs-replace.asciidoc index b73bf1b3..07cf2ae9 100644 --- a/Documentation/btrfs-replace.asciidoc +++ b/Documentation/btrfs-replace.asciidoc @@ -18,7 +18,7 @@ SUBCOMMAND *cancel* :: Cancel a running device replace operation. -*start* [-Bfr] | :: +*start* [-aBfr] | :: Replace device of a btrfs filesystem. + On a live filesystem, duplicate the data to the target device which @@ -53,6 +53,9 @@ never allowed to be used as the . + -B:::: no background replace. ++a:::: +automatically resizes the filesystem to it's max size if the is +bigger than . *status* [-1] :: Print status and progress information of a running device replace operation. diff --git a/cmds/replace.c b/cmds/replace.c index 2321aa15..8761bfc0 100644 --- a/cmds/replace.c +++ b/cmds/replace.c @@ -91,7 +91,7 @@ static int dev_replace_handle_sigint(int fd) } static const char *const cmd_replace_start_usage[] = { - "btrfs replace start [-Bfr] | ", + "btrfs replace start [-aBfr] | ", "Replace device of a btrfs filesystem.", "On a live filesystem, duplicate the data to the target device which", "is currently stored on the source device. If the source device is not", @@ -104,6 +104,8 @@ static const char *const cmd_replace_start_usage[] = { "from the system, you have to use the parameter format.", "The needs to be same size or larger than the .", "", + "-a automatically resizes the filesystem to it's max size if the", + " is bigger than ", "-r only read from if no other zero-defect mirror exists", " (enable this if your drive has lots of read errors, the access", " would be very slow)", @@ -129,6 +131,7 @@ static int cmd_replace_start(const struct cmd_struct *cmd, char *path; char *srcdev; char *dstdev = NULL; + bool auto_resize = false; int avoid_reading_from_srcdev = 0; int force_using_targetdev = 0; u64 dstdev_block_count; @@ -138,8 +141,11 @@ static int cmd_replace_start(const struct cmd_struct *cmd, u64 dstdev_size; optind = 0; - while ((c = getopt(argc, argv, "Brf")) != -1) { + while ((c = getopt(argc, argv, "aBrf")) != -1) { switch (c) { + case 'a': + auto_resize = true; + break; case 'B': do_not_background = 1; break; @@ -309,6 +315,17 @@ static int cmd_replace_start(const struct cmd_struct *cmd, goto leave_with_error; } } + + if (ret == 0 && auto_resize && dstdev_size > srcdev_size) { + char amount[BTRFS_PATH_NAME_MAX + 1]; + snprintf(amount, BTRFS_PATH_NAME_MAX, "%s:max", srcdev); + + if (resize_filesystem(amount, path)) { + warning("resize failed, please resize the filesystem manually"); + goto leave_with_error; + } + } + close_file_or_dir(fdmnt, dirstream); return 0;