[PATCH] fs: implement cdev_mount()

[PATCH] fs: implement cdev_mount()

[Ahmad Fatoum]

EFI loaders provide both block device and file system access to software
running under it. For file system access, we will just want to get a
mount if available and mount at a default location if not. Provide a
helper that does just that.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 fs/fs.c      | 19 +++++++++++++++++++
 include/fs.h |  1 +
 2 files changed, 20 insertions(+)

diff --git a/fs/fs.c b/fs/fs.c
index 78878e7112d5..a314a49b2db7 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -999,6 +999,25 @@ const char *cdev_mount_default(struct cdev *cdev, const char *fsoptions)
 	return cdev_get_mount_path(cdev);
 }
 
+/*
+ * cdev_mount - return existing mount or mount a cdev to the default path
+ *
+ * If a cdev is already mounted anywhere return the path
+ * it's mounted on.
+ * Otherwise mount it to /mnt/<cdevname> and return the path. Returns an
+ * error pointer on failure.
+ */
+const char *cdev_mount(struct cdev *cdev)
+{
+	const char *path;
+
+	path = cdev_get_mount_path(cdev);
+	if (path)
+		return path;
+
+	return cdev_mount_default(cdev, NULL);
+}
+
 /*
  * mount_all - iterate over block devices and mount all devices we are able to
  */
diff --git a/include/fs.h b/include/fs.h
index 894cae3e4c2f..9ea522dc2cc3 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -164,6 +164,7 @@ int fs_init_legacy(struct fs_device_d *fsdev);
 int fsdev_open_cdev(struct fs_device_d *fsdev);
 const char *cdev_get_mount_path(struct cdev *cdev);
 const char *cdev_mount_default(struct cdev *cdev, const char *fsoptions);
+const char *cdev_mount(struct cdev *cdev);
 void mount_all(void);
 
 void fsdev_set_linux_rootarg(struct fs_device_d *fsdev, const char *str);
-- 
2.30.2

Re: [PATCH] fs: implement cdev_mount()

[Sascha Hauer]

On Fri, Sep 30, 2022 at 05:40:17PM +0200, Ahmad Fatoum wrote:
> EFI loaders provide both block device and file system access to software
> running under it. For file system access, we will just want to get a
> mount if available and mount at a default location if not. Provide a
> helper that does just that.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  fs/fs.c      | 19 +++++++++++++++++++
>  include/fs.h |  1 +
>  2 files changed, 20 insertions(+)

Applied, thanks.

Also added the following.

Sascha

-----------------------------8<------------------------
>From 49c2e4ebe8f4b5f457201385f075fb80476a7977 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue, 4 Oct 2022 11:02:40 +0200
Subject: [PATCH] blspec: Use cdev_mount()

In blspec we want either get the path where the cdev is mounted or mount
it to the default path. That's what cdev_mount() does for us, so use it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/blspec.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/blspec.c b/common/blspec.c
index d391f690ad..9ae7b49a77 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -677,9 +677,7 @@ static int blspec_scan_cdev(struct bootentries *bootentries, struct cdev *cdev)
 			found += ret;
 	}
 
-	rootpath = cdev_get_mount_path(cdev);
-	if (!rootpath)
-		rootpath = cdev_mount_default(cdev, NULL);
+	rootpath = cdev_mount(cdev);
 	if (!IS_ERR(rootpath)) {
 		ret = blspec_scan_directory(bootentries, rootpath);
 		if (ret > 0)
-- 
2.30.2

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |