From patchwork Wed Jul 6 12:25:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 9216383 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 8F807607D9 for ; Wed, 6 Jul 2016 13:24:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80FAF288BE for ; Wed, 6 Jul 2016 13:24:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 755E6288C2; Wed, 6 Jul 2016 13:24:45 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 024F8288BE for ; Wed, 6 Jul 2016 13:24:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754592AbcGFNYf (ORCPT ); Wed, 6 Jul 2016 09:24:35 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:34861 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754374AbcGFNYY (ORCPT ); Wed, 6 Jul 2016 09:24:24 -0400 Received: by mail-pa0-f68.google.com with SMTP id dx3so4428434pab.2 for ; Wed, 06 Jul 2016 06:24:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=G2VuqBnsvkl+ipnUKTb8VF+bMoXlB2FSu4TveBWarb4=; b=qLje+k23X18qjzkw/Bm989AVqvN+ZlERnFslYVYEDfLiEMDCD9TRpzIfo9mS5hq4tG XiNirEd8ZbcXJDMpP1V1E2zu5LZeVlJVBbqjftF3mWaLAk1bCGvUACewlblHjwIGBKFP +4DLVS/p65WWGMyZN9Yc2H6+JjD4+Q25KqQvIHPGhC69qouduZYeW4yp8Kron1am5vV0 OQmfAI5BNt3lUigNdCqlJ+B8pNTqrYXFh05Qf2QC8oNs3IverG+2QVIE+q9rxMNYcIZn k3vvf2/ki8OItA7FnZ/AE1bQYqQWk7L8ia9YuXNtbSGtvBjJcNa3We/NZPoUTeYVpu/H Iv2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=G2VuqBnsvkl+ipnUKTb8VF+bMoXlB2FSu4TveBWarb4=; b=PgJx2Pkzz3cv6aPO1uA/8ET2Te2l/NVAvVwIuA1t6H3b9SschcHs3oyCh86iuIoHe4 qUjHlqNAQoxiz+LvXml86GlzuXCU+fZuJ86DJYj8qz/RhjH8w+bOSx701E3ba6FiU3Z7 YZ0iwtTaoxWj8NqfT8IOz2V+M1FQbNqamzz/WLxbgskYsj/mhv5Ew8pN5xy+mROEsSop ykx6djJ3d3HYW+HqRMuhQfmqGwe949JHO4w1m3DHux1rrmtJDSEZx5IAxceHZzYRHkVU ktZ+jnPkl0BgkiSUqsi/2QPy8J3nUmQ13+/pG9QNvO7H7IAQbznE2ZdcWom2Z2Lmy08/ pWLA== X-Gm-Message-State: ALyK8tKA3x3yslQAE+l0u6PC0GZfDqbNF0ZKiarCouUfI6IT4ctpjuZFFlVgkEuLuRvKeQ== X-Received: by 10.66.185.229 with SMTP id ff5mr42320951pac.132.1467811463484; Wed, 06 Jul 2016 06:24:23 -0700 (PDT) Received: from localhost.localdomain ([45.32.20.47]) by smtp.gmail.com with ESMTPSA id z189sm4946811pfb.34.2016.07.06.06.24.20 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 06 Jul 2016 06:24:22 -0700 (PDT) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz, wangshilong1991@gmail.com Subject: [PATCH] btrfs-progs: du: fix to skip not btrfs dir/file Date: Wed, 6 Jul 2016 21:25:34 +0900 Message-Id: <1467807934-23403-1-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 2.7.4 (Apple Git-66) 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 'btrfs file du' is a very useful tool to watch my system file usage with snapshot aware. when trying to run following commands: [root@localhost btrfs-progs]# btrfs file du / Total Exclusive Set shared Filename ERROR: Failed to lookup root id - Inappropriate ioctl for device ERROR: cannot check space of '/': Unknown error -1 and My Filesystem looks like this: [root@localhost btrfs-progs]# df -Th Filesystem Type Size Used Avail Use% Mounted on devtmpfs devtmpfs 16G 0 16G 0% /dev tmpfs tmpfs 16G 368K 16G 1% /dev/shm tmpfs tmpfs 16G 1.4M 16G 1% /run tmpfs tmpfs 16G 0 16G 0% /sys/fs/cgroup /dev/sda3 btrfs 60G 19G 40G 33% / tmpfs tmpfs 16G 332K 16G 1% /tmp /dev/sdc btrfs 2.8T 166G 1.7T 9% /data /dev/sda2 xfs 2.0G 452M 1.6G 23% /boot /dev/sda1 vfat 1.9G 11M 1.9G 1% /boot/efi tmpfs tmpfs 3.2G 24K 3.2G 1% /run/user/1000 So I installed Btrfs as my root partition, but boot partition can be other fs. We can Let btrfs tool aware of this is not a btrfs file or directory and skip those files, so that someone like me could just run 'btrfs file du /' to scan all btrfs filesystems. After patch, it will look like: Total Exclusive Set shared Filename skipping not btrfs dir/file: boot skipping not btrfs dir/file: dev skipping not btrfs dir/file: proc skipping not btrfs dir/file: run skipping not btrfs dir/file: sys 0.00B 0.00B - //root/.bash_logout 0.00B 0.00B - //root/.bash_profile 0.00B 0.00B - //root/.bashrc 0.00B 0.00B - //root/.cshrc 0.00B 0.00B - //root/.tcshrc This works for me to analysis system usage and analysis performaces. Signed-off-by: Wang Shilong --- cmds-fi-du.c | 11 ++++++++++- cmds-inspect.c | 2 +- utils.c | 8 ++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/cmds-fi-du.c b/cmds-fi-du.c index 12855a5..bf0e62c 100644 --- a/cmds-fi-du.c +++ b/cmds-fi-du.c @@ -389,8 +389,17 @@ static int du_walk_dir(struct du_dir_ctxt *ctxt, struct rb_root *shared_extents) dirfd(dirstream), shared_extents, &tot, &shr, 0); - if (ret) + if (ret == -ENOTTY) { + fprintf(stdout, + "skipping not btrfs dir/file: %s\n", + entry->d_name); + continue; + } else if (ret) { + fprintf(stderr, + "failed to walk dir/file: %s :%s\n", + entry->d_name, strerror(-ret)); break; + } ctxt->bytes_total += tot; ctxt->bytes_shared += shr; diff --git a/cmds-inspect.c b/cmds-inspect.c index dd7b9dd..2ae44be 100644 --- a/cmds-inspect.c +++ b/cmds-inspect.c @@ -323,7 +323,7 @@ static int cmd_inspect_rootid(int argc, char **argv) ret = lookup_ino_rootid(fd, &rootid); if (ret) { - error("rootid failed with ret=%d", ret); + error("failed to lookup root id: %s", strerror(-ret)); goto out; } diff --git a/utils.c b/utils.c index 578fdb0..f73b048 100644 --- a/utils.c +++ b/utils.c @@ -2815,6 +2815,8 @@ path: if (fd < 0) goto err; ret = lookup_ino_rootid(fd, &id); + if (ret) + error("failed to lookup root id: %s", strerror(-ret)); close(fd); if (ret < 0) goto err; @@ -3497,10 +3499,8 @@ int lookup_ino_rootid(int fd, u64 *rootid) args.objectid = BTRFS_FIRST_FREE_OBJECTID; ret = ioctl(fd, BTRFS_IOC_INO_LOOKUP, &args); - if (ret < 0) { - error("failed to lookup root id: %s", strerror(errno)); - return ret; - } + if (ret < 0) + return -errno; *rootid = args.treeid;