From patchwork Fri Jan 26 18:41:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10186785 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 54E82601D5 for ; Fri, 26 Jan 2018 18:42:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4767B29EC8 for ; Fri, 26 Jan 2018 18:42:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C00D29ED0; Fri, 26 Jan 2018 18:42:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C757229EC8 for ; Fri, 26 Jan 2018 18:42:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752396AbeAZSmv (ORCPT ); Fri, 26 Jan 2018 13:42:51 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:37967 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751581AbeAZSlh (ORCPT ); Fri, 26 Jan 2018 13:41:37 -0500 Received: by mail-pg0-f66.google.com with SMTP id y27so790192pgc.5 for ; Fri, 26 Jan 2018 10:41:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=VmAGmDeY+QQ1iGEf24CQxtYN1uS2u+xj4MzdNUUPcAg=; b=G/CM3NdTuCrnIMzr9lVdAV018DnKXjWVxFIVXmaZQ2lOoc+o2LPnXkxhtMytwLycmS NGjobHEyztXFXH3X39IZ9+DL85roQeC0plOgO5wcnbkoq5hsi/lyY/4WkW0vnCzsX5HD EzH/RTbevoi7hmpeEd0I3nLNBKtY8rypN3dKYQw5JRaxE0DGEZTBZectcA9QBmVt4KB1 8XnVO61u09ZOo5h1KuBn3O1fy+pOVCoQPI9tOgMMbNRiI9t1viOQ4z9UeTjbNFOtOhYF jQY6zFZ8yEVAw6dByfVfAydR1vR2NGje5/2JxghAiA79iF6904HKf+KCA9pCiW0+RvZb WP1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=VmAGmDeY+QQ1iGEf24CQxtYN1uS2u+xj4MzdNUUPcAg=; b=OT0r/biJw8mlqGNmh9z4InNts2nUCqdNdCHigZbhuVHirnVmG343/zxA3jI0AhyR6A q0pXjKCd0n67k2s/MpsADQPh/k34FRQwgcHePDbunxfMmeiCCjc2sC79gGniCOrHiLGn NHLUQ5Wu9UekWQq4n5XkXUIsWxAWE1idbb1C4OJ7UtarC3gM+8T5o+NP6VDLbkwR5W1t LgrIOcR1nCOmhRhQa90F69ljpLeFeNum0O0kuX/LOzyWp0ufzhYwWTj7PYqsb3/Q/lcT oRi5kF3Y9ySxsqTVWrzEzWRh/GP890I/JIDt+Uyb89pvuihCTracjRamID519Y2dmSDc bXbg== X-Gm-Message-State: AKwxyte9WfEYag8s3lyVZSXD/MveyxuDng53KJBdFAzj/NkYmCZXlbd6 JUSsdaIdQRzd5c6ZoksPKUv/p5k390k= X-Google-Smtp-Source: AH8x227yhzDBQCfWv+PHTjZHw1bZKKKIGVraotW//5TMJtpybc7GkTrOAWjOL2zPh1/YbPyYVuJ3ug== X-Received: by 2002:a17:902:b101:: with SMTP id q1-v6mr351988plr.378.1516992096770; Fri, 26 Jan 2018 10:41:36 -0800 (PST) Received: from vader.thefacebook.com ([2620:10d:c090:200::6:7f96]) by smtp.gmail.com with ESMTPSA id y29sm19627400pff.24.2018.01.26.10.41.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jan 2018 10:41:36 -0800 (PST) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com Subject: [PATCH 15/26] btrfs-progs: use libbtrfsutil for read-only property Date: Fri, 26 Jan 2018 10:41:03 -0800 Message-Id: <68d46bceaaa3f6e7310f7672d50d5875c92bf9ea.1516991902.git.osandov@fb.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval Signed-off-by: Omar Sandoval --- props.c | 69 ++++++++++++++++++++++++----------------------------------------- 1 file changed, 25 insertions(+), 44 deletions(-) diff --git a/props.c b/props.c index cddbd927..e4edba06 100644 --- a/props.c +++ b/props.c @@ -21,6 +21,8 @@ #include #include +#include + #include "ctree.h" #include "commands.h" #include "utils.h" @@ -41,56 +43,35 @@ static int prop_read_only(enum prop_object_type type, const char *name, const char *value) { - int ret = 0; - int fd = -1; - u64 flags = 0; - - fd = open(object, O_RDONLY); - if (fd < 0) { - ret = -errno; - error("failed to open %s: %s", object, strerror(-ret)); - goto out; - } + enum btrfs_util_error err; + bool read_only; - ret = ioctl(fd, BTRFS_IOC_SUBVOL_GETFLAGS, &flags); - if (ret < 0) { - ret = -errno; - error("failed to get flags for %s: %s", object, - strerror(-ret)); - goto out; - } - - if (!value) { - if (flags & BTRFS_SUBVOL_RDONLY) - fprintf(stdout, "ro=true\n"); - else - fprintf(stdout, "ro=false\n"); - ret = 0; - goto out; - } + if (value) { + if (!strcmp(value, "true")) { + read_only = true; + } else if (!strcmp(value, "false")) { + read_only = false; + } else { + error("invalid value for property: %s", value); + return -EINVAL; + } - if (!strcmp(value, "true")) { - flags |= BTRFS_SUBVOL_RDONLY; - } else if (!strcmp(value, "false")) { - flags = flags & ~BTRFS_SUBVOL_RDONLY; + err = btrfs_util_set_subvolume_read_only(object, read_only); + if (err) { + error_btrfs_util(err); + return -errno; + } } else { - ret = -EINVAL; - error("invalid value for property: %s", value); - goto out; - } + err = btrfs_util_get_subvolume_read_only(object, &read_only); + if (err) { + error_btrfs_util(err); + return -errno; + } - ret = ioctl(fd, BTRFS_IOC_SUBVOL_SETFLAGS, &flags); - if (ret < 0) { - ret = -errno; - error("failed to set flags for %s: %s", object, - strerror(-ret)); - goto out; + printf("ro=%s\n", read_only ? "true" : "false"); } -out: - if (fd != -1) - close(fd); - return ret; + return 0; } static int prop_label(enum prop_object_type type,