From: Franck Jullien <franck.jullien@xxxxxxxxx>
Mount without argument always print a "none" as device name mounted
because entry->parent_device is always NULL.
The problem is the mount function in fs/fs.c. parent_device is
initialized to NULL and never updated. With this patch,
parent_device is set with the mounted device name.
Moreover, the mount function has been modified to print the device
name plus device id using the dev_name function.
Signed-off-by: Franck Jullien <franck.jullien@xxxxxxxxx>
---
commands/mount.c | 2 +-
fs/fs.c | 7 +++++++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/commands/mount.c b/commands/mount.c
index 52d1700..7cefdbe 100644
--- a/commands/mount.c
+++ b/commands/mount.c
@@ -40,7 +40,7 @@ static int do_mount(struct command *cmdtp, int argc, char *argv[])
entry = mtab_next_entry(entry);
if (entry) {
printf("%s on %s type %s\n",
- entry->parent_device ? entry->parent_device->name : "none",
+ entry->parent_device ? dev_name(entry->parent_device) : "none",
entry->path,
entry->dev->name);
}
diff --git a/fs/fs.c b/fs/fs.c
index 51a7411..c70b691 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -739,6 +739,7 @@ int mount(const char *device, const char *fsname, const char *_path)
struct mtab_entry *entry;
struct fs_device_d *fsdev;
struct device_d *dev, *parent_device = NULL;
+ struct cdev *cdev = NULL;
int ret;
char *path = normalise_path(_path);
@@ -804,6 +805,12 @@ int mount(const char *device, const char *fsname, const char *_path)
goto out2;
}
+ if (!strncmp(device, "/dev/", 5)) {
+ cdev = cdev_by_name(device + 5);
+ if(cdev)
+ parent_device = cdev->dev;
+ }
+
if (parent_device)
dev_add_child(parent_device, &fsdev->dev);
--
1.7.7
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
