From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 02 Jun 2022 22:01:12 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nwr0J-000vfe-W8 for lore@lore.pengutronix.de; Thu, 02 Jun 2022 22:01:12 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nwr0I-0002Zw-Ib for lore@pengutronix.de; Thu, 02 Jun 2022 22:01:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=r47xTk/M641omO5Cfap8193TzAHN0/MkrWW8kjJ7YbM=; b=sBh2O9ohYWnC6T Hj8OGp+J3vokuBqYeZHkgcQFtcZnI6GqecwLkJLHMpjieWMPShSndgMqLUYjtkGIFk6jtIKDlh+R5 bU9oq+478eBSpAsIS+EqDFs3FQq9YCM0BqdGbco+yqi/WE7MNRG+EeDw6zxxaiEEHWxDitglWZP8U 1jjqy5y1TelCGjZJmJSWvKjb8rr99QOyJ9hG+wZC2F1Swco2o7oRVdAWg94FzohYSxMk9SV7J0A8S iGbvDNdcgskEt6qMb8hWy5K3rPsbo2JLxILeue6ew0caznGoN6Uwd7zYJYIFG1qWQP53HUoF48vUC DfPTA1wV1ndagbrUsw5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwqyg-004BTd-SV; Thu, 02 Jun 2022 19:59:30 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwqyZ-004BRl-UO for barebox@lists.infradead.org; Thu, 02 Jun 2022 19:59:25 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nwqyV-00022A-UQ; Thu, 02 Jun 2022 21:59:19 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nwqyW-0065OQ-AX; Thu, 02 Jun 2022 21:59:18 +0200 Received: from afa by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nwqyT-0002N7-5P; Thu, 02 Jun 2022 21:59:17 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Jules Maselbas Date: Thu, 2 Jun 2022 21:59:16 +0200 Message-Id: <20220602195916.9061-2-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602195916.9061-1-a.fatoum@pengutronix.de> References: <20220602195916.9061-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220602_125924_043914_6E8CD4E0 X-CRM114-Status: GOOD ( 17.86 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.0 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,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 2/2] block: set S_IFBLK for block devices instead of S_IFCHR X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) From: Ahmad Fatoum In barebox, block devices are a special case of character devices. Nevertheless, differentiation can be useful to allow scripts iterating over all block devices without accounting for naming, e.g. for dev in /dev/*; do test -b $dev && echo $dev: blockdevice done Add the necessary support. This will break scripts that assume test -c blockdevice to be true, but that's a quite improbable check. Tested-by: Jules Maselbas Signed-off-by: Ahmad Fatoum --- v1 -> v2: - Collected Jules Tested-by - added !CONFIG_BLOCK stub for cdev_get_block_device (Sascha) - added !cdev check to cdev_get_block_device --- commands/memtester/memtester.c | 2 +- common/block.c | 8 ++++++++ fs/devfs.c | 7 ++++++- fs/legacy.c | 1 + include/block.h | 9 +++++++++ 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/commands/memtester/memtester.c b/commands/memtester/memtester.c index 130dc97c8334..f4adbfc855cb 100644 --- a/commands/memtester/memtester.c +++ b/commands/memtester/memtester.c @@ -113,7 +113,7 @@ static int do_memtester(int argc, char **argv) { strerror(errno)); return COMMAND_ERROR_USAGE; } else { - if (!S_ISCHR(statbuf.st_mode)) { + if (!S_ISCHR(statbuf.st_mode) && !S_ISBLK(statbuf.st_mode)) { printf("can not mmap non-char device %s\n", optarg); return COMMAND_ERROR_USAGE; diff --git a/common/block.c b/common/block.c index 1d386edcfd49..19bb81df2c3d 100644 --- a/common/block.c +++ b/common/block.c @@ -361,6 +361,14 @@ static struct cdev_operations block_ops = { .discard_range = block_op_discard_range, }; +struct block_device *cdev_get_block_device(struct cdev *cdev) +{ + if (!cdev || cdev->ops != &block_ops) + return NULL; + + return container_of(cdev, struct block_device, cdev); +} + int blockdevice_register(struct block_device *blk) { loff_t size = (loff_t)blk->num_blocks * BLOCKSIZE(blk); diff --git a/fs/devfs.c b/fs/devfs.c index deb244feeab6..49cd48f6d84e 100644 --- a/fs/devfs.c +++ b/fs/devfs.c @@ -29,6 +29,7 @@ #include #include #include +#include struct devfs_inode { struct inode inode; @@ -231,6 +232,7 @@ static struct inode *devfs_get_inode(struct super_block *sb, const struct inode default: return NULL; case S_IFCHR: + case S_IFBLK: inode->i_op = &devfs_file_inode_operations; inode->i_fop = &devfs_file_operations; break; @@ -250,12 +252,15 @@ static struct dentry *devfs_lookup(struct inode *dir, struct dentry *dentry, struct devfs_inode *dinode; struct inode *inode; struct cdev *cdev; + umode_t mode; cdev = cdev_by_name(dentry->name); if (!cdev) return ERR_PTR(-ENOENT); - inode = devfs_get_inode(dir->i_sb, dir, S_IFCHR); + mode = cdev_get_block_device(cdev) ? S_IFBLK : S_IFCHR; + + inode = devfs_get_inode(dir->i_sb, dir, mode); if (!inode) return ERR_PTR(-ENOMEM); diff --git a/fs/legacy.c b/fs/legacy.c index fc6a18f408ed..779f54629440 100644 --- a/fs/legacy.c +++ b/fs/legacy.c @@ -288,6 +288,7 @@ static struct inode *legacy_get_inode(struct super_block *sb, const struct inode return NULL; case S_IFREG: case S_IFCHR: + case S_IFBLK: inode->i_op = &legacy_file_inode_operations; break; case S_IFDIR: diff --git a/include/block.h b/include/block.h index d3a154bf73c0..1fb40e942f9f 100644 --- a/include/block.h +++ b/include/block.h @@ -49,4 +49,13 @@ static inline int block_flush(struct block_device *blk) return cdev_flush(&blk->cdev); } +#ifdef CONFIG_BLOCK +struct block_device *cdev_get_block_device(struct cdev *cdev); +#else +static inline struct block_device *cdev_get_block_device(struct cdev *cdev) +{ + return NULL; +} +#endif + #endif /* __BLOCK_H */ -- 2.30.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox