X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffstools.git;a=blobdiff_plain;f=block.c;h=7db30acb205d5c99e6574160f39602b127cb4fa3;hp=9d22458c5e624c18d62a5ac7807b1df92b264ee5;hb=refs%2Fheads%2Flede-17.01;hpb=f800782ac2426c12e001467b5222331957185854 diff --git a/block.c b/block.c index 9d22458..7db30ac 100644 --- a/block.c +++ b/block.c @@ -22,12 +22,16 @@ #include #include #include +#include +#include +#include #include #include #include #include #include +#include #include @@ -657,9 +661,6 @@ static int print_block_info(struct probe_info *pr) if (pr->label) printf(" LABEL=\"%s\"", pr->label); - if (pr->name) - printf(" NAME=\"%s\"", pr->name); - if (pr->version) printf(" VERSION=\"%s\"", pr->version); @@ -690,6 +691,7 @@ static void check_filesystem(struct probe_info *pr) pid_t pid; struct stat statbuf; const char *e2fsck = "/usr/sbin/e2fsck"; + const char *f2fsck = "/usr/sbin/fsck.f2fs"; const char *dosfsck = "/usr/sbin/dosfsck"; const char *ckfs; @@ -699,6 +701,8 @@ static void check_filesystem(struct probe_info *pr) if (!strncmp(pr->type, "vfat", 4)) { ckfs = dosfsck; + } else if (!strncmp(pr->type, "f2fs", 4)) { + ckfs = f2fsck; } else if (!strncmp(pr->type, "ext", 3)) { ckfs = e2fsck; } else { @@ -713,8 +717,13 @@ static void check_filesystem(struct probe_info *pr) pid = fork(); if (!pid) { - execl(ckfs, ckfs, "-p", pr->dev, NULL); - exit(-1); + if(!strncmp(pr->type, "f2fs", 4)) { + execl(ckfs, ckfs, "-f", pr->dev, NULL); + exit(-1); + } else { + execl(ckfs, ckfs, "-p", pr->dev, NULL); + exit(-1); + } } else if (pid > 0) { int status; @@ -754,6 +763,143 @@ static void handle_swapfiles(bool on) } } +static void to_devnull(int fd) +{ + int devnull = open("/dev/null", fd ? O_WRONLY : O_RDONLY); + + if (devnull >= 0) + dup2(devnull, fd); + + if (devnull > STDERR_FILENO) + close(devnull); +} + +static int exec_mount(const char *source, const char *target, + const char *fstype, const char *options) +{ + pid_t pid; + struct stat s; + FILE *mount_fd; + int err, status, pfds[2]; + char errmsg[128], cmd[sizeof("/sbin/mount.XXXXXXXXXXXXXXXX\0")]; + + snprintf(cmd, sizeof(cmd), "/sbin/mount.%s", fstype); + + if (stat(cmd, &s) < 0 || !S_ISREG(s.st_mode) || !(s.st_mode & S_IXUSR)) { + ULOG_ERR("No \"mount.%s\" utility available\n", fstype); + return -1; + } + + if (pipe(pfds) < 0) + return -1; + + fcntl(pfds[0], F_SETFD, fcntl(pfds[0], F_GETFD) | FD_CLOEXEC); + fcntl(pfds[1], F_SETFD, fcntl(pfds[1], F_GETFD) | FD_CLOEXEC); + + pid = vfork(); + + switch (pid) { + case -1: + close(pfds[0]); + close(pfds[1]); + + return -1; + + case 0: + to_devnull(STDIN_FILENO); + to_devnull(STDOUT_FILENO); + + dup2(pfds[1], STDERR_FILENO); + close(pfds[0]); + close(pfds[1]); + + if (options && *options) + execl(cmd, cmd, "-o", options, source, target, NULL); + else + execl(cmd, cmd, source, target, NULL); + + return -1; + + default: + close(pfds[1]); + + mount_fd = fdopen(pfds[0], "r"); + + while (fgets(errmsg, sizeof(errmsg), mount_fd)) + ULOG_ERR("mount.%s: %s", fstype, errmsg); + + fclose(mount_fd); + + err = waitpid(pid, &status, 0); + + if (err != -1) { + if (status != 0) { + ULOG_ERR("mount.%s: failed with status %d\n", fstype, status); + errno = EINVAL; + err = -1; + } else { + errno = 0; + err = 0; + } + } + + break; + } + + return err; +} + +static int handle_mount(const char *source, const char *target, + const char *fstype, struct mount *m) +{ + int i, err; + size_t mount_opts_len; + char *mount_opts = NULL, *ptr; + + err = mount(source, target, fstype, m ? m->flags : 0, + (m && m->options) ? m->options : ""); + + /* Requested file system type is not available in kernel, + attempt to call mount helper. */ + if (err == -1 && errno == ENODEV) { + if (m) { + /* Convert mount flags back into string representation, + first calculate needed length of string buffer... */ + mount_opts_len = 1 + (m->options ? strlen(m->options) : 0); + + for (i = 0; i < ARRAY_SIZE(mount_flags); i++) + if ((mount_flags[i].flag > 0) && + (mount_flags[i].flag < INT_MAX) && + (m->flags & (uint32_t)mount_flags[i].flag)) + mount_opts_len += strlen(mount_flags[i].name) + 1; + + /* ... then now allocate and fill it ... */ + ptr = mount_opts = calloc(1, mount_opts_len); + + if (!ptr) { + errno = ENOMEM; + return -1; + } + + if (m->options) + ptr += sprintf(ptr, "%s,", m->options); + + for (i = 0; i < ARRAY_SIZE(mount_flags); i++) + if ((mount_flags[i].flag > 0) && + (mount_flags[i].flag < INT_MAX) && + (m->flags & (uint32_t)mount_flags[i].flag)) + ptr += sprintf(ptr, "%s,", mount_flags[i].name); + + mount_opts[mount_opts_len - 1] = 0; + } + + /* ... and now finally invoke the external mount program */ + err = exec_mount(source, target, fstype, mount_opts); + } + + return err; +} + static int mount_device(struct probe_info *pr, int hotplug) { struct mount *m; @@ -803,11 +949,10 @@ static int mount_device(struct probe_info *pr, int hotplug) if (check_fs) check_filesystem(pr); - err = mount(pr->dev, target, pr->type, m->flags, - (m->options) ? (m->options) : ("")); + err = handle_mount(pr->dev, target, pr->type, m); if (err) ULOG_ERR("mounting %s (%s) as %s failed (%d) - %s\n", - pr->dev, pr->type, target, err, strerror(err)); + pr->dev, pr->type, target, errno, strerror(errno)); else handle_swapfiles(true); return err; @@ -823,10 +968,10 @@ static int mount_device(struct probe_info *pr, int hotplug) if (check_fs) check_filesystem(pr); - err = mount(pr->dev, target, pr->type, 0, ""); + err = handle_mount(pr->dev, target, pr->type, NULL); if (err) ULOG_ERR("mounting %s (%s) as %s failed (%d) - %s\n", - pr->dev, pr->type, target, err, strerror(err)); + pr->dev, pr->type, target, errno, strerror(errno)); else handle_swapfiles(true); return err; @@ -859,7 +1004,7 @@ static int umount_device(struct probe_info *pr) err = umount2(mp, MNT_DETACH); if (err) ULOG_ERR("unmounting %s (%s) failed (%d) - %s\n", - pr->dev, mp, err, strerror(err)); + pr->dev, mp, errno, strerror(errno)); else ULOG_INFO("unmounted %s (%s)\n", pr->dev, mp); @@ -888,7 +1033,7 @@ static int main_hotplug(int argc, char **argv) if (err) ULOG_ERR("umount of %s failed (%d) - %s\n", - mount_point, err, strerror(err)); + mount_point, errno, strerror(errno)); free(mount_point); return 0; @@ -1157,8 +1302,9 @@ static int mount_extroot(char *cfg) } if (pr) { if (strncmp(pr->type, "ext", 3) && + strncmp(pr->type, "f2fs", 4) && strncmp(pr->type, "ubifs", 5)) { - ULOG_ERR("extroot: unsupported filesystem %s, try ext4\n", pr->type); + ULOG_ERR("extroot: unsupported filesystem %s, try ext4, f2fs or ubifs\n", pr->type); return -1; } @@ -1179,7 +1325,7 @@ static int mount_extroot(char *cfg) if (err) { ULOG_ERR("extroot: mounting %s (%s) on %s failed: %d (%s)\n", - pr->dev, pr->type, path, err, strerror(err)); + pr->dev, pr->type, path, errno, strerror(errno)); } else if (m->overlay) { err = check_extroot(path); if (err)