From patchwork Tue Nov 12 13:41:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3172301 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9C7CE9F39E for ; Tue, 12 Nov 2013 13:42:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 812AC20458 for ; Tue, 12 Nov 2013 13:42:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B18620212 for ; Tue, 12 Nov 2013 13:42:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755211Ab3KLNmX (ORCPT ); Tue, 12 Nov 2013 08:42:23 -0500 Received: from mail-we0-f170.google.com ([74.125.82.170]:57975 "EHLO mail-we0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754795Ab3KLNmP (ORCPT ); Tue, 12 Nov 2013 08:42:15 -0500 Received: by mail-we0-f170.google.com with SMTP id p61so1957wes.15 for ; Tue, 12 Nov 2013 05:42:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LfAFpHO2JgjwqPgrBYGqJXRPI9JWXMTu09nhQfxqIoI=; b=HaSjnyaRjfOb6LNK2XnV9DJ+lt2/NmRSQxcSs6vXgpJE3AZbDXCSMeDW/aE8CioUp4 /LZ0eP1TfYI2xtNSEQMroWsyI1292Kdyt5oCO7CrXMtgYk+GZF+XipcTLkGKkMxn+TeO DMuJCZ0x3fUdCWJFUvI1/VREJlWEL5G1f7TJ+T+fWnyzxED2mNgwnSnoPg3YuFt1wnDg uffynZwB/LNYOpJt2Yp9xyQoQuzGOJkls47IYhyMbA/0BhaZA2+Pdi3ODx30RnFkFoKP rDcKqcT9l7B5BNVTp76OKaTvsJKLVqbZt7ulri+OQ+C39R6LT6fRWvCfa/Zv+PpCRYYv eyOw== X-Received: by 10.180.219.33 with SMTP id pl1mr16654839wic.49.1384263734792; Tue, 12 Nov 2013 05:42:14 -0800 (PST) Received: from storm-desktop.lan (bl5-6-81.dsl.telepac.pt. [82.154.6.81]) by mx.google.com with ESMTPSA id dj8sm44636382wid.2.2013.11.12.05.42.14 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Nov 2013 05:42:14 -0800 (PST) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH 4/5] Btrfs-progs: add type root to label property Date: Tue, 12 Nov 2013 13:41:45 +0000 Message-Id: <1384263706-25549-5-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1384263706-25549-1-git-send-email-fdmanana@gmail.com> References: <1384263706-25549-1-git-send-email-fdmanana@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP So that we can get the label of a mounted filesystem. Before this change: $ btrfs prop get /mnt/btrfs label ERROR: object is not compatible with property $ btrfs prop get /dev/sdb3 label ERROR: dev /dev/sdb3 is mounted, use mount point ERROR: failed to set/get property for object. After this change: $ btrfs prop get /mnt/btrfs label label=foobar Signed-off-by: Filipe David Borba Manana --- props.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/props.c b/props.c index 763fd57..12fdc52 100644 --- a/props.c +++ b/props.c @@ -105,6 +105,7 @@ static int prop_label(enum prop_object_type type, const struct prop_handler prop_handlers[] = { {"ro", "Set/get read-only flag of subvolume.", 0, prop_object_subvol, prop_read_only}, - {"label", "Set/get label of device.", 0, prop_object_dev, prop_label}, + {"label", "Set/get label of device.", 0, + prop_object_dev | prop_object_root, prop_label}, {0, 0, 0, 0, 0} };