From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 27 Nov 2025 10:20:08 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vOYAa-005NYY-11 for lore@lore.pengutronix.de; Thu, 27 Nov 2025 10:20:08 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vOYAZ-0003YU-Ib for lore@pengutronix.de; Thu, 27 Nov 2025 10:20:08 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=nNoWroHVA6Mn5n1/YcCwlmLM8Pv7xFRhFnJpgjP5izM=; b=0HwhHGApACqH7TGpV+aQ3Osn04 R8HEr3ObbJJUeYc+VPV6Zsb0GyUc2WQGspNUqikmG+fi7amHkdPcEvPFzzpcYKRGvZPB5GNXQ9Uis zQNNByPpFO3I7vwlHGWmdVElQ0m3bKEdIByfJGOQG6JxXDOM+YiDHFN38cR0NTFlJ5j9ywrb9g6v6 RogOekoCd99197NuIQHT56+8xgh+mabz4mo091P3XaAtJCxLbaldG4FgG+6VyAfqOtVHhBKvtNLRL CzBKJFROfJlA2JeoDUf0x9LmWSXsrZXDHwfunqkRJZZhTQPTbacZXKTRmbV5lTb7VX5FbEFbbbTSU EUU9Y/Ig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vOY9z-0000000GGi8-1kZl; Thu, 27 Nov 2025 09:19:31 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vOY9v-0000000GGfG-3TeW for barebox@lists.infradead.org; Thu, 27 Nov 2025 09:19:29 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vOY9u-00035M-Au; Thu, 27 Nov 2025 10:19:26 +0100 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vOY9u-002lPI-02; Thu, 27 Nov 2025 10:19:26 +0100 Received: from localhost ([::1] helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1vOY9u-00000000tc4-1Mhm; Thu, 27 Nov 2025 10:19:25 +0100 From: Sascha Hauer Date: Thu, 27 Nov 2025 10:19:30 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251127-devfs-v1-8-4aff12818757@pengutronix.de> References: <20251127-devfs-v1-0-4aff12818757@pengutronix.de> In-Reply-To: <20251127-devfs-v1-0-4aff12818757@pengutronix.de> To: BAREBOX X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764235165; l=1864; i=s.hauer@pengutronix.de; s=20230412; h=from:subject:message-id; bh=L4jkJVobHmfFrx1tubR8l818Z9Qxkx781CAlLkbUeCw=; b=VVb9eWq/dXMqLYCOD/C6K8mQpQDx5QQBvrS7NhrHv7o9rGH7BRWBVbmFBVwJFuYPGE4W8Pwv/ Bx10U2kFzAQC9Gt5FV6qEbPghqZTuhv5VpIfFWQGNuYAmTsYGZhyN+s X-Developer-Key: i=s.hauer@pengutronix.de; a=ed25519; pk=4kuc9ocmECiBJKWxYgqyhtZOHj5AWi7+d0n/UjhkwTg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251127_011927_877375_ABC2757B X-CRM114-Status: GOOD ( 12.06 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.1 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 08/10] fs: stat_print: get cdevname from stat X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) In stat_print() we have to take the filename component of the input path and retrieve the cdev from that name. Now that we have the cdevname in struct stat we can simplify this. Signed-off-by: Sascha Hauer --- fs/fs.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/fs/fs.c b/fs/fs.c index 41cdaf5070798388aa989d16e7bf2ace081b4a2b..4146ecbf3c01229cac89e5acdbc42d66ffc97dfc 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -137,7 +137,6 @@ void stat_print(int dirfd, const char *filename, const struct stat *st) struct fs_device *fdev; struct cdev *cdev = NULL; const char *type = NULL, *typeprefix = ""; - bool is_cdev_link = false; char modestr[11]; mkmodestr(st->st_mode, modestr); @@ -152,23 +151,10 @@ void stat_print(int dirfd, const char *filename, const struct stat *st) case S_IFREG: type = "regular file"; break; } - if (st->st_mode & S_IFCHR) { - char *path; - - path = canonicalize_path(dirfd, filename); - if (path) { - const char *devicefile = devpath_to_name(path); - struct cdev *lcdev; - - lcdev = lcdev_by_name(devicefile); - cdev = cdev_readlink(lcdev); - if (cdev != lcdev) - is_cdev_link = true; - if (cdev) - bdev = cdev_get_block_device(cdev); - - free(path); - } + if ((st->st_mode & S_IFCHR) && st->st_cdevname) { + cdev = cdev_by_name(st->st_cdevname); + if (cdev) + bdev = cdev_get_block_device(cdev); } printf(" File: %s", filename); @@ -182,9 +168,6 @@ void stat_print(int dirfd, const char *filename, const struct stat *st) printf(" -> ", ERR_PTR(ret)); else printf(" -> %s", realname); - } else if (is_cdev_link) { - printf(" ~> %s", cdev->name); - typeprefix = "cdev link to "; } printf("\nSize: "); -- 2.47.3