diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-09-14 15:52:59 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-09-14 15:52:59 +0200 |
commit | 19df0b5883737c6ce50b893dfc8fe1722cd6560a (patch) | |
tree | 4a90f708d33a44f0b40eab69134543c38629c884 /fs/fs.c | |
parent | d01b0a64580833b4ccf10e6361badee1d81e1221 (diff) | |
parent | 7a9d2377b5e54cfec28a7645985a7371c1d8b8af (diff) | |
download | barebox-19df0b5883737c6ce50b893dfc8fe1722cd6560a.tar.gz |
Merge branch 'for-next/misc'
Diffstat (limited to 'fs/fs.c')
-rw-r--r-- | fs/fs.c | 50 |
1 files changed, 35 insertions, 15 deletions
@@ -2869,12 +2869,23 @@ int popd(char *oldcwd) return ret; } -static char *get_linux_mmcblkdev(struct fs_device_d *fsdev) +static bool cdev_partname_equal(const struct cdev *a, + const struct cdev *b) { - struct cdev *cdevm, *cdev; + return a->partname && b->partname && + !strcmp(a->partname, b->partname); +} + +static char *get_linux_mmcblkdev(const struct cdev *root_cdev) +{ + struct cdev *cdevm = root_cdev->master, *cdev; int id, partnum; - cdevm = fsdev->cdev->master; + if (!IS_ENABLED(CONFIG_MMCBLKDEV_ROOTARG)) + return NULL; + if (!cdevm || !cdev_is_mci_main_part_dev(cdevm)) + return NULL; + id = of_alias_get_id(cdevm->device_node, "mmc"); if (id < 0) return NULL; @@ -2887,8 +2898,7 @@ static char *get_linux_mmcblkdev(struct fs_device_d *fsdev) * in the partitions list so we need to count it instead of * skipping it. */ - if (cdev->partname && - !strcmp(cdev->partname, fsdev->cdev->partname)) + if (cdev_partname_equal(root_cdev, cdev)) return basprintf("root=/dev/mmcblk%dp%d", id, partnum); partnum++; } @@ -2896,6 +2906,23 @@ static char *get_linux_mmcblkdev(struct fs_device_d *fsdev) return NULL; } +char *cdev_get_linux_rootarg(const struct cdev *cdev) +{ + char *str; + + if (!cdev) + return NULL; + + str = get_linux_mmcblkdev(cdev); + if (str) + return str; + + if (cdev->uuid[0] != 0) + return basprintf("root=PARTUUID=%s", cdev->uuid); + + return NULL; +} + /* * Mount a device to a directory. * We do this by registering a new device on which the filesystem @@ -2984,17 +3011,10 @@ int mount(const char *device, const char *fsname, const char *pathname, fsdev->vfsmount.mnt_root = fsdev->sb.s_root; - if (!fsdev->linux_rootarg && fsdev->cdev) { - char *str = NULL; - - if (IS_ENABLED(CONFIG_MMCBLKDEV_ROOTARG) && - fsdev->cdev->master && - cdev_is_mci_main_part_dev(fsdev->cdev->master)) - str = get_linux_mmcblkdev(fsdev); - - if (!str && fsdev->cdev->uuid[0] != 0) - str = basprintf("root=PARTUUID=%s", fsdev->cdev->uuid); + if (!fsdev->linux_rootarg) { + char *str; + str = cdev_get_linux_rootarg(fsdev->cdev); if (str) fsdev_set_linux_rootarg(fsdev, str); } |