From patchwork Tue Mar 31 19:10:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 11468289 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 85CEE1667 for ; Tue, 31 Mar 2020 19:10:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D5AF208E0 for ; Tue, 31 Mar 2020 19:10:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=libero.it header.i=@libero.it header.b="gdMTnS2k" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727740AbgCaTKx (ORCPT ); Tue, 31 Mar 2020 15:10:53 -0400 Received: from smtp-16.italiaonline.it ([213.209.10.16]:59717 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727509AbgCaTKx (ORCPT ); Tue, 31 Mar 2020 15:10:53 -0400 Received: from venice.bhome ([94.37.173.46]) by smtp-16.iol.local with ESMTPA id JMHijXV70jfNYJMHjj3qIS; Tue, 31 Mar 2020 21:10:51 +0200 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2014; t=1585681851; bh=jiB7VSegMmHun/qtf1IscaDsX3ydWWc+sMSu9KK9XX0=; h=From; b=gdMTnS2kQYneRdX1HODsqF3WDVlpvqsvI6Cee0WOH9sdFN4ueZPocIuriAwZIpsiH gznlpxiS8pCGD9aKVe7lQoPvXE9YTPuRnmNF+uZXyCR85+4f+k+0q839UgtyodB28M JhxsmML3oxtlARXUk8vQmbbbyYYTXv23/hyxdpX6mSHZ5drkqPb6gsQFx5tEPIkfog Gam7IoAhXK6NDm1LqKYLBarZ1EydurDGlFm0dO5huAvpNC5AogduNHJk+G4H9DCxoS 3pFpnC+cHh53IduDnZfUNyyE4dLI3ceGoOLG74Lj3xLr4vMn7S92ExNs6ysfHlWY86 5poRZfmJFC4Dw== X-CNFS-Analysis: v=2.3 cv=av7M9hRV c=1 sm=1 tr=0 a=TpQr5eyM7/bznjVQAbUtjA==:117 a=TpQr5eyM7/bznjVQAbUtjA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=4G7CR4st1VtwzTxLfKwA:9 From: Goffredo Baroncelli To: linux-btrfs@vger.kernel.org Cc: Zygo Blaxell , Qu Wenruo , David Sterba , Goffredo Baroncelli Subject: [PATCH 1/4] Complete the implementation of RAID1C[34]. Date: Tue, 31 Mar 2020 21:10:42 +0200 Message-Id: <20200331191045.8991-2-kreijack@libero.it> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200331191045.8991-1-kreijack@libero.it> References: <20200331191045.8991-1-kreijack@libero.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfGNfLIHCkLZha9d5dLtr7lsKmMdrqTXWKjPExfzL24rKaiOhP05e2IuAS8mgYOBQ7n/WFTWzKxrs8waBs59DvmAOYl0UHtvoESmNGPjQQbe1Ct9ywePY cLjDv3yncj3M9CTr4Fnt06QQUtAUgp+oqHrlLNDVhAi2n5CQZTLaBYqNNx+HBp0wH5PLeOkL/D3SCMGfquR0QMF308wzWPbLVsXXTrS5GDT+YzW/HdlMcPrF Aj0OEcDmKJF7eKrmljdqxCa0FUZgSqsHX2Lja0lIaKUMElcIW733xuWE3etbT0otLV8Ar6e8zctT50v2X/QvOA== Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Goffredo Baroncelli - Complete the function btrfs_err_str adding some missing cases. - Sync the enum btrfs_err_code (in ibbtrfsutil/btrfs.h) with the rest of the codes (user space and kernel space). - Add missing fields to btrfs_raid_array[] for raid1c[34] Signed-off-by: Goffredo Baroncelli --- ioctl.h | 4 ++++ libbtrfsutil/btrfs.h | 4 +++- volumes.c | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ioctl.h b/ioctl.h index 4e7efd94..ade6dcb9 100644 --- a/ioctl.h +++ b/ioctl.h @@ -798,6 +798,10 @@ static inline char *btrfs_err_str(enum btrfs_err_code err_code) switch (err_code) { case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET: return "unable to go below two devices on raid1"; + case BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET: + return "unable to go below three devices on raid1c3"; + case BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET: + return "unable to go below four devices on raid1c4"; case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET: return "unable to go below four devices on raid10"; case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET: diff --git a/libbtrfsutil/btrfs.h b/libbtrfsutil/btrfs.h index 4bc12754..60d51ff6 100644 --- a/libbtrfsutil/btrfs.h +++ b/libbtrfsutil/btrfs.h @@ -830,7 +830,9 @@ enum btrfs_err_code { BTRFS_ERROR_DEV_TGT_REPLACE, BTRFS_ERROR_DEV_MISSING_NOT_FOUND, BTRFS_ERROR_DEV_ONLY_WRITABLE, - BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS + BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS, + BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET, + BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET, }; #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ diff --git a/volumes.c b/volumes.c index b46bf598..7f84fbba 100644 --- a/volumes.c +++ b/volumes.c @@ -65,6 +65,9 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .tolerated_failures = 2, .devs_increment = 3, .ncopies = 3, + .raid_name = "raid1c3", + .bg_flag = BTRFS_BLOCK_GROUP_RAID1C3, + .mindev_error = BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET, }, [BTRFS_RAID_RAID1C4] = { .sub_stripes = 1, @@ -74,6 +77,9 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .tolerated_failures = 3, .devs_increment = 4, .ncopies = 4, + .raid_name = "raid1c4", + .bg_flag = BTRFS_BLOCK_GROUP_RAID1C4, + .mindev_error = BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET, }, [BTRFS_RAID_DUP] = { .sub_stripes = 1, From patchwork Tue Mar 31 19:10:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 11468293 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 02C8C14B4 for ; Tue, 31 Mar 2020 19:10:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB374212CC for ; Tue, 31 Mar 2020 19:10:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=libero.it header.i=@libero.it header.b="XBWgdrhI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727875AbgCaTKy (ORCPT ); Tue, 31 Mar 2020 15:10:54 -0400 Received: from smtp-16.italiaonline.it ([213.209.10.16]:47216 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726295AbgCaTKx (ORCPT ); Tue, 31 Mar 2020 15:10:53 -0400 Received: from venice.bhome ([94.37.173.46]) by smtp-16.iol.local with ESMTPA id JMHijXV70jfNYJMHjj3qIa; Tue, 31 Mar 2020 21:10:51 +0200 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2014; t=1585681851; bh=2A03QjPnWHEHDdEsb/WOGQ5nNmWI6TQsphlRQcpid7g=; h=From; b=XBWgdrhImDJN+F+EDryzdega19r9qCYhit5SUgOUKmTcyVj2xFXxFaRg8q5RK2zwk 3//UAgjFqjNjBrMtaUx5QaHGAZB2lseApIFpnez7gDhvsb+4c7yjzhkqsnf5jk24uM T0BB+uBo2PPUyzLuotAfhLfhfw1N9BKa0bn74s91umthNukxHBImFXlrG1lLPuLHbG ZDaJYSnhBz5fClmehHktC8dVLmzvUQPJ7kGQMr5WV5tBkMgPMrC6/t2KXTxXjaJPbc 4OKC4Zwi8PfXD4IKWGiFKxvLdhGB2rxr+8grq1G8VfiPk3QO4T1zgPuoCqQ8iiKZu4 /ddF3mBWc1gFA== X-CNFS-Analysis: v=2.3 cv=av7M9hRV c=1 sm=1 tr=0 a=TpQr5eyM7/bznjVQAbUtjA==:117 a=TpQr5eyM7/bznjVQAbUtjA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=fdgFY_N7qoPLzqVp-50A:9 From: Goffredo Baroncelli To: linux-btrfs@vger.kernel.org Cc: Zygo Blaxell , Qu Wenruo , David Sterba , Goffredo Baroncelli Subject: [PATCH 2/4] btrfs-progs: Add BTRFS_EXTENDED_PROFILE_MASK mask. Date: Tue, 31 Mar 2020 21:10:43 +0200 Message-Id: <20200331191045.8991-3-kreijack@libero.it> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200331191045.8991-1-kreijack@libero.it> References: <20200331191045.8991-1-kreijack@libero.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfGNfLIHCkLZha9d5dLtr7lsKmMdrqTXWKjPExfzL24rKaiOhP05e2IuAS8mgYOBQ7n/WFTWzKxrs8waBs59DvmAOYl0UHtvoESmNGPjQQbe1Ct9ywePY cLjDv3yncj3M9CTr4Fnt06QQUtAUgp+oqHrlLNDVhAi2n5CQZTLaBYqNNx+HBp0wH5PLeOkL/D3SCMGfquR0QMF308wzWPbLVsXXTrS5GDT+YzW/HdlMcPrF Aj0OEcDmKJF7eKrmljdqxCa0FUZgSqsHX2Lja0lIaKUMElcIW733xuWE3etbT0otLV8Ar6e8zctT50v2X/QvOA== Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Goffredo Baroncelli Add BTRFS_EXTENDED_PROFILE_MASK to consider also the BTRFS_AVAIL_ALLOC_BIT_SINGLE bit. Signed-off-by: Goffredo Baroncelli --- ctree.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ctree.h b/ctree.h index 691481bc..9d69fa94 100644 --- a/ctree.h +++ b/ctree.h @@ -1005,6 +1005,9 @@ enum btrfs_raid_types { /* used in struct btrfs_balance_args fields */ #define BTRFS_AVAIL_ALLOC_BIT_SINGLE (1ULL << 48) +#define BTRFS_EXTENDED_PROFILE_MASK (BTRFS_BLOCK_GROUP_PROFILE_MASK | \ + BTRFS_AVAIL_ALLOC_BIT_SINGLE) + /* * GLOBAL_RSV does not exist as a on-disk block group type and is used * internally for exporting info about global block reserve from space infos From patchwork Tue Mar 31 19:10:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 11468295 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 C163214B4 for ; Tue, 31 Mar 2020 19:10:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A0178212CC for ; Tue, 31 Mar 2020 19:10:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=libero.it header.i=@libero.it header.b="pds9Jwv4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728187AbgCaTK4 (ORCPT ); Tue, 31 Mar 2020 15:10:56 -0400 Received: from smtp-16.italiaonline.it ([213.209.10.16]:39284 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726548AbgCaTKy (ORCPT ); Tue, 31 Mar 2020 15:10:54 -0400 Received: from venice.bhome ([94.37.173.46]) by smtp-16.iol.local with ESMTPA id JMHijXV70jfNYJMHjj3qIg; Tue, 31 Mar 2020 21:10:51 +0200 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2014; t=1585681851; bh=oCAZ2eL/I/S+3h+iFU+9Scu4YhYHopcqXNDARGxW4eY=; h=From; b=pds9Jwv4BryH4exGtlCRPcQBRWFIUL8oIxPMfD4mJjIOE74N1H1LanfFlbTXEywFy 28cDVEUbJNo6x5v3vIgr5G7he+LYoLpYty4Fvs5LtONZGg2vmVFZfJGqHReZtG/Ioy GUzau9W88wJ+mwuzQq/CD2eFawr7VOuyxdLOWJgU3qFtwesFKQ/hmEOkFqErKq5Svi 3/9ewnASnZ5K2iApO5edKeOYFvUQBMhY+7jOMQ0rPqyh7kujmZuzWdBUNCb7F+UmOd 06oQrZmj1FvI+2dRN3OCQkp1esVh3W0KGPc3w7Co5OPkBlp/DuqqSUFaYhmo1kvMIL 26YkfcEZi5a9A== X-CNFS-Analysis: v=2.3 cv=av7M9hRV c=1 sm=1 tr=0 a=TpQr5eyM7/bznjVQAbUtjA==:117 a=TpQr5eyM7/bznjVQAbUtjA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=vSNmOmVH6_Tz5GIeFn8A:9 a=pHzHmUro8NiASowvMSCR:22 a=nt3jZW36AmriUCFCBwmW:22 From: Goffredo Baroncelli To: linux-btrfs@vger.kernel.org Cc: Zygo Blaxell , Qu Wenruo , David Sterba , Goffredo Baroncelli Subject: [PATCH 3/4] btrfs-progs: Add btrfs_check_for_mixed_profiles_by_* function Date: Tue, 31 Mar 2020 21:10:44 +0200 Message-Id: <20200331191045.8991-4-kreijack@libero.it> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200331191045.8991-1-kreijack@libero.it> References: <20200331191045.8991-1-kreijack@libero.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfGNfLIHCkLZha9d5dLtr7lsKmMdrqTXWKjPExfzL24rKaiOhP05e2IuAS8mgYOBQ7n/WFTWzKxrs8waBs59DvmAOYl0UHtvoESmNGPjQQbe1Ct9ywePY cLjDv3yncj3M9CTr4Fnt06QQUtAUgp+oqHrlLNDVhAi2n5CQZTLaBYqNNx+HBp0wH5PLeOkL/D3SCMGfquR0QMF308wzWPbLVsXXTrS5GDT+YzW/HdlMcPrF Aj0OEcDmKJF7eKrmljdqxCa0FUZgSqsHX2Lja0lIaKUMElcIW733xuWE3etbT0otLV8Ar6e8zctT50v2X/QvOA== Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Goffredo Baroncelli Show a warning if a mixed profiles filesystem is detected. Signed-off-by: Goffredo Baroncelli --- common/utils.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++++ common/utils.h | 3 ++ 2 files changed, 129 insertions(+) diff --git a/common/utils.c b/common/utils.c index a7761683..e3f18709 100644 --- a/common/utils.c +++ b/common/utils.c @@ -1710,3 +1710,129 @@ void print_all_devices(struct list_head *devices) print_device_info(dev, "\t"); printf("\n"); } + +static int bit_count(u64 x) +{ + int ret = 0; + + while (x) { + if (x & 1) + ret++; + x >>= 1; + } + return ret; +} + +static void print_profiles(FILE *out, u64 profiles) +{ + int i; + int first = true; + + for (i = 0 ; i < BTRFS_NR_RAID_TYPES ; i++) { + if (!(btrfs_raid_array[i].bg_flag & profiles)) + continue; + + if (!first) + fprintf(out, ", "); + fprintf(out, "%s", btrfs_raid_array[i].raid_name); + first = false; + } + if (profiles & BTRFS_AVAIL_ALLOC_BIT_SINGLE) { + if (!first) + fprintf(out, ", "); + fprintf(out, "%s", + btrfs_raid_array[BTRFS_RAID_SINGLE].raid_name); + } +} + +int btrfs_check_for_mixed_profiles_by_path(char *path) +{ + int fd; + int ret; + DIR *dirstream; + + fd = btrfs_open_dir(path, &dirstream, 0); + if (fd < 0) + return -1; + closedir(dirstream); + + ret = btrfs_check_for_mixed_profiles_by_fd(fd); + close(fd); + + return ret; +} + +int btrfs_check_for_mixed_profiles_by_fd(int fd) +{ + int ret; + int i; + struct btrfs_ioctl_space_args *sargs; + u64 data_profiles = 0; + u64 metadata_profiles = 0; + u64 system_profiles = 0; + u64 mixed_profiles = 0; + static const u64 mixed_profile_fl = BTRFS_BLOCK_GROUP_METADATA | + BTRFS_BLOCK_GROUP_DATA; + + ret = get_df(fd, &sargs); + if (ret < 0) + return -1; + + for (i = 0 ; i < sargs->total_spaces ; i++) { + u64 flags = sargs->spaces[i].flags; + + if (!(flags & BTRFS_BLOCK_GROUP_PROFILE_MASK)) + flags |= BTRFS_AVAIL_ALLOC_BIT_SINGLE; + + if ((flags & mixed_profile_fl) == mixed_profile_fl) + mixed_profiles |= flags; + else if (flags & BTRFS_BLOCK_GROUP_DATA) + data_profiles |= flags; + else if (flags & BTRFS_BLOCK_GROUP_METADATA) + metadata_profiles |= flags; + else if (flags & BTRFS_BLOCK_GROUP_SYSTEM) + system_profiles |= flags; + } + free(sargs); + + data_profiles &= BTRFS_EXTENDED_PROFILE_MASK; + system_profiles &= BTRFS_EXTENDED_PROFILE_MASK; + mixed_profiles &= BTRFS_EXTENDED_PROFILE_MASK; + metadata_profiles &= BTRFS_EXTENDED_PROFILE_MASK; + + if ((bit_count(data_profiles) <= 1) && + (bit_count(metadata_profiles) <= 1) && + (bit_count(system_profiles) <= 1) && + (bit_count(mixed_profiles) <= 1)) + return 0; + + fprintf(stderr, "WARNING: ------------------------------------------------------\n"); + fprintf(stderr, "WARNING: Detection of multiple profiles for a block group type:\n"); + fprintf(stderr, "WARNING:\n"); + if (bit_count(data_profiles) > 1) { + fprintf(stderr, "WARNING: * DATA -> ["); + print_profiles(stderr, data_profiles); + fprintf(stderr, "]\n"); + } + if (bit_count(metadata_profiles) > 1) { + fprintf(stderr, "WARNING: * METADATA -> ["); + print_profiles(stderr, metadata_profiles); + fprintf(stderr, "]\n"); + } + if (bit_count(mixed_profiles) > 1) { + fprintf(stderr, "WARNING: * DATA+METADATA -> ["); + print_profiles(stderr, mixed_profiles); + fprintf(stderr, "]\n"); + } + if (bit_count(system_profiles) > 1) { + fprintf(stderr, "WARNING: * SYSTEM -> ["); + print_profiles(stderr, system_profiles); + fprintf(stderr, "]\n"); + } + fprintf(stderr, "WARNING:\n"); + fprintf(stderr, "WARNING: Please consider using 'btrfs balance ...' commands set\n"); + fprintf(stderr, "WARNING: to solve this issue.\n"); + fprintf(stderr, "WARNING: ------------------------------------------------------\n"); + + return 1; +} diff --git a/common/utils.h b/common/utils.h index 5c1afda9..662c9e38 100644 --- a/common/utils.h +++ b/common/utils.h @@ -137,4 +137,7 @@ u64 rand_u64(void); unsigned int rand_range(unsigned int upper); void init_rand_seed(u64 seed); +int btrfs_check_for_mixed_profiles_by_path(char *path); +int btrfs_check_for_mixed_profiles_by_fd(int fd); + #endif From patchwork Tue Mar 31 19:10:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 11468291 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 3F95914B4 for ; Tue, 31 Mar 2020 19:10:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E1E2208E0 for ; Tue, 31 Mar 2020 19:10:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=libero.it header.i=@libero.it header.b="hu6AkePh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728091AbgCaTKy (ORCPT ); Tue, 31 Mar 2020 15:10:54 -0400 Received: from smtp-16.italiaonline.it ([213.209.10.16]:56339 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727575AbgCaTKy (ORCPT ); Tue, 31 Mar 2020 15:10:54 -0400 Received: from venice.bhome ([94.37.173.46]) by smtp-16.iol.local with ESMTPA id JMHijXV70jfNYJMHkj3qIq; Tue, 31 Mar 2020 21:10:52 +0200 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2014; t=1585681852; bh=at9o5w250skn0GTKQQ8ooc9pRYpcGLL8iMwCqqqupEM=; h=From; b=hu6AkePhRX5wDSlFr440yrGGMmMoJZCaq+kc9uFA3Z1504M2zo2ykDcGpor/CZLmg 1OGApe7IcPsJjaqzlUydao13Qwbp0EYWoyNz+fO/SPSzGTO2zlywsLzE3cS9wyell0 5A4ljqGYykyFODJ6TH0rE0jjUihG8SvVkWBuSfk27REQR4gTdyiLTCraoVAxj2TeL6 fkjfRgq7nuJFTD8iZnHG9dLuLdaH48JmWuaEo2Z2kPfGBkzrv+/r7FwtDMDH0YLsNT xj2pVGb6TaaclcTUguF260pOQ0rd4HF8U7XM3nuH+zXQZqGmKbuDEbvGcDGHnvi+Bz q8t7DJ7wYK9Iw== X-CNFS-Analysis: v=2.3 cv=av7M9hRV c=1 sm=1 tr=0 a=TpQr5eyM7/bznjVQAbUtjA==:117 a=TpQr5eyM7/bznjVQAbUtjA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=mUxrmllu26sYn3iLKTUA:9 From: Goffredo Baroncelli To: linux-btrfs@vger.kernel.org Cc: Zygo Blaxell , Qu Wenruo , David Sterba , Goffredo Baroncelli Subject: [PATCH 4/4] btrfs-progs: Add mixed profiles check to some btrfs sub-commands. Date: Tue, 31 Mar 2020 21:10:45 +0200 Message-Id: <20200331191045.8991-5-kreijack@libero.it> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200331191045.8991-1-kreijack@libero.it> References: <20200331191045.8991-1-kreijack@libero.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfDNnDyr6Or4O2Gr6C/oqRlRS2OV+OrtORSLl/djSPY53+IHTiAnavn0FwbDscIeMzoXxMMrYcHUZAY9up/WvQt6khxHQXHEFQehJ9EMYlK8bqb3HXmF2 bYaXZRjSpuZ2yoEadSBCxEAkZKZYSqFgoN0umsdY83rSbIj5GiPzcBbK6NjasLLVjZ/BcNtwpBNJGaGEsqc2ZkZNeK3NofeMbQTz4EafrrPosH0acWRLRJ5Z AXsLJppxXx72MWLQE/gyY6SznOMN9Ad1ZBcwWsVEVLh36zG0JxKvxocVEudzWa8d8D5SlPfDZm+lu99FyZK7NQ== Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Goffredo Baroncelli Add a check in some btrfs subcommands to detect if a filesystem has mixed profiles for data/metadata/system. In this case a warning is showed. Signed-off-by: Goffredo Baroncelli --- cmds/balance.c | 2 ++ cmds/device.c | 3 +++ cmds/filesystem-usage.c | 1 + cmds/filesystem.c | 1 + 4 files changed, 7 insertions(+) diff --git a/cmds/balance.c b/cmds/balance.c index 5392a604..20d0ebc1 100644 --- a/cmds/balance.c +++ b/cmds/balance.c @@ -716,6 +716,7 @@ static int cmd_balance_pause(const struct cmd_struct *cmd, ret = 1; } + btrfs_check_for_mixed_profiles_by_fd(fd); close_file_or_dir(fd, dirstream); return ret; } @@ -756,6 +757,7 @@ static int cmd_balance_cancel(const struct cmd_struct *cmd, ret = 1; } + btrfs_check_for_mixed_profiles_by_fd(fd); close_file_or_dir(fd, dirstream); return ret; } diff --git a/cmds/device.c b/cmds/device.c index 24158308..d83f92a7 100644 --- a/cmds/device.c +++ b/cmds/device.c @@ -143,6 +143,7 @@ static int cmd_device_add(const struct cmd_struct *cmd, } error_out: + btrfs_check_for_mixed_profiles_by_fd(fdmnt); close_file_or_dir(fdmnt, dirstream); return !!ret; } @@ -225,6 +226,7 @@ static int _cmd_device_remove(const struct cmd_struct *cmd, } } + btrfs_check_for_mixed_profiles_by_fd(fdmnt); close_file_or_dir(fdmnt, dirstream); return !!ret; } @@ -659,6 +661,7 @@ static int cmd_device_usage(const struct cmd_struct *cmd, int argc, char **argv) } ret = _cmd_device_usage(fd, argv[i], unit_mode); + btrfs_check_for_mixed_profiles_by_fd(fd); close_file_or_dir(fd, dirstream); if (ret) diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c index aa7065d5..ce07d80f 100644 --- a/cmds/filesystem-usage.c +++ b/cmds/filesystem-usage.c @@ -1043,6 +1043,7 @@ static int cmd_filesystem_usage(const struct cmd_struct *cmd, ret = print_filesystem_usage_by_chunk(fd, chunkinfo, chunkcount, devinfo, devcount, argv[i], unit_mode, tabular); cleanup: + btrfs_check_for_mixed_profiles_by_fd(fd); close_file_or_dir(fd, dirstream); free(chunkinfo); free(devinfo); diff --git a/cmds/filesystem.c b/cmds/filesystem.c index 4f22089a..c4bb13dd 100644 --- a/cmds/filesystem.c +++ b/cmds/filesystem.c @@ -111,6 +111,7 @@ static int cmd_filesystem_df(const struct cmd_struct *cmd, error("get_df failed: %m"); } + btrfs_check_for_mixed_profiles_by_fd(fd); close_file_or_dir(fd, dirstream); return !!ret; }