X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffstools.git;a=blobdiff_plain;f=block.c;h=05f84aac9e2d2dcdfd26cfbbbf87d7e41cfbb895;hp=2d44a8a59885d63310092c179902c406b2ba353b;hb=84b530a732b12cca1cd5ee9ba163b7ead7a83de3;hpb=89847de58a17dacedab36ef07ec4c12ef8c0e84a diff --git a/block.c b/block.c index 2d44a8a..05f84aa 100644 --- a/block.c +++ b/block.c @@ -22,6 +22,9 @@ #include #include #include +#include +#include +#include #include #include @@ -29,6 +32,8 @@ #include #include +#include + #include #include @@ -38,7 +43,7 @@ #include #include -#include "libblkid-tiny/libblkid-tiny.h" +#include "probe.h" #ifdef UBIFS_EXTROOT #include "libubi/libubi.h" @@ -147,18 +152,6 @@ struct mount_flag { int32_t flag; }; -#ifndef MS_DIRSYNC -# define MS_DIRSYNC (1 << 7) -#endif - -#ifndef MS_RELATIME -# define MS_RELATIME (1 << 21) -#endif - -#ifndef MS_STRICTATIME -# define MS_STRICTATIME (1 << 24) -#endif - static const struct mount_flag mount_flags[] = { { "sync", MS_SYNCHRONOUS }, { "async", ~MS_SYNCHRONOUS }, @@ -180,6 +173,10 @@ static const struct mount_flag mount_flags[] = { { "relatime", MS_RELATIME }, { "norelatime", ~MS_RELATIME }, { "strictatime", MS_STRICTATIME }, + { "acl", MS_POSIXACL }, + { "noacl", ~MS_POSIXACL }, + { "nouser_xattr", MS_NOUSER }, + { "user_xattr", ~MS_NOUSER }, }; static char *blobmsg_get_strdup(struct blob_attr *attr) @@ -467,24 +464,21 @@ static int config_load(char *cfg) return 0; } -static struct blkid_struct_probe* _probe_path(char *path) +static struct probe_info* _probe_path(char *path) { - struct blkid_struct_probe *pr; + struct probe_info *pr; + char tmppath[64]; - pr = malloc(sizeof(*pr)); - - if (!pr) - return NULL; - - memset(pr, 0, sizeof(*pr)); - probe_block(path, pr); - - if (pr->err || !pr->id) { - free(pr); - return NULL; + /* skip ubi device if ubiblock device is present */ + if (path[5] == 'u' && path[6] == 'b' && path[7] == 'i' && + path[8] >= '0' && path[8] <= '9' ) { + snprintf(tmppath, sizeof(tmppath), "/dev/ubiblock%s", path + 8); + list_for_each_entry(pr, &devices, list) + if (!strcasecmp(pr->dev, tmppath)) + return NULL; } - return pr; + return probe_path(path); } static int _cache_load(const char *path) @@ -497,7 +491,7 @@ static int _cache_load(const char *path) return -1; for (j = 0; j < gl.gl_pathc; j++) { - struct blkid_struct_probe *pr = _probe_path(gl.gl_pathv[j]); + struct probe_info *pr = _probe_path(gl.gl_pathv[j]); if (pr) list_add_tail(&pr->list, &devices); } @@ -512,8 +506,9 @@ static void cache_load(int mtd) if (mtd) { _cache_load("/dev/mtdblock*"); _cache_load("/dev/ubiblock*"); - _cache_load("/dev/ubi?*_?*"); + _cache_load("/dev/ubi[0-9]*"); } + _cache_load("/dev/loop*"); _cache_load("/dev/mmcblk*"); _cache_load("/dev/sd*"); _cache_load("/dev/hd*"); @@ -522,35 +517,16 @@ static void cache_load(int mtd) _cache_load("/dev/mapper/*"); } -static int print_block_info(struct blkid_struct_probe *pr) -{ - printf("%s:", pr->dev); - if (pr->uuid[0]) - printf(" UUID=\"%s\"", pr->uuid); - - if (pr->label[0]) - printf(" LABEL=\"%s\"", pr->label); - - if (pr->name[0]) - printf(" NAME=\"%s\"", pr->name); - if (pr->version[0]) - printf(" VERSION=\"%s\"", pr->version); - - printf(" TYPE=\"%s\"\n", pr->id->name); - - return 0; -} - -static int print_block_uci(struct blkid_struct_probe *pr) +static int print_block_uci(struct probe_info *pr) { - if (!strcmp(pr->id->name, "swap")) { + if (!strcmp(pr->type, "swap")) { printf("config 'swap'\n"); } else { printf("config 'mount'\n"); printf("\toption\ttarget\t'/mnt/%s'\n", basename(pr->dev)); } - if (pr->uuid[0]) + if (pr->uuid) printf("\toption\tuuid\t'%s'\n", pr->uuid); else printf("\toption\tdevice\t'%s'\n", pr->dev); @@ -559,23 +535,23 @@ static int print_block_uci(struct blkid_struct_probe *pr) return 0; } -static struct blkid_struct_probe* find_block_info(char *uuid, char *label, char *path) +static struct probe_info* find_block_info(char *uuid, char *label, char *path) { - struct blkid_struct_probe *pr = NULL; + struct probe_info *pr = NULL; if (uuid) list_for_each_entry(pr, &devices, list) - if (!strcasecmp(pr->uuid, uuid)) + if (pr->uuid && !strcasecmp(pr->uuid, uuid)) return pr; if (label) list_for_each_entry(pr, &devices, list) - if (!strcmp(pr->label, label)) + if (pr->label && !strcmp(pr->label, label)) return pr; if (path) list_for_each_entry(pr, &devices, list) - if (!strcmp(basename(pr->dev), basename(path))) + if (pr->dev && !strcmp(basename(pr->dev), basename(path))) return pr; return NULL; @@ -583,25 +559,86 @@ static struct blkid_struct_probe* find_block_info(char *uuid, char *label, char static char* find_mount_point(char *block) { - FILE *fp = fopen("/proc/mounts", "r"); + FILE *fp = fopen("/proc/self/mountinfo", "r"); static char line[256]; int len = strlen(block); - char *point = NULL; + char *point = NULL, *pos, *tmp, *cpoint, *devname; + struct stat s; + int rstat; + unsigned int minor, major; - if(!fp) + if (!fp) return NULL; + rstat = stat(block, &s); + while (fgets(line, sizeof(line), fp)) { - if (!strncmp(line, block, len)) { - char *p = &line[len + 1]; - char *t = strstr(p, " "); + pos = strchr(line, ' '); + if (!pos) + continue; - if (!t) { - fclose(fp); - return NULL; - } - *t = '\0'; - point = p; + pos = strchr(pos + 1, ' '); + if (!pos) + continue; + + tmp = ++pos; + pos = strchr(pos, ':'); + if (!pos) + continue; + + *pos = '\0'; + major = atoi(tmp); + tmp = ++pos; + pos = strchr(pos, ' '); + if (!pos) + continue; + + *pos = '\0'; + minor = atoi(tmp); + pos = strchr(pos + 1, ' '); + if (!pos) + continue; + tmp = ++pos; + + pos = strchr(pos, ' '); + if (!pos) + continue; + *pos = '\0'; + cpoint = tmp; + + pos = strchr(pos + 1, ' '); + if (!pos) + continue; + + pos = strchr(pos + 1, ' '); + if (!pos) + continue; + + pos = strchr(pos + 1, ' '); + if (!pos) + continue; + + tmp = ++pos; + pos = strchr(pos, ' '); + if (!pos) + continue; + + *pos = '\0'; + devname = tmp; + if (!strncmp(block, devname, len)) { + point = strdup(cpoint); + break; + } + + if (rstat) + continue; + + if (!S_ISBLK(s.st_mode)) + continue; + + if (major == major(s.st_rdev) && + minor == minor(s.st_rdev)) { + point = strdup(cpoint); break; } } @@ -611,6 +648,31 @@ static char* find_mount_point(char *block) return point; } +static int print_block_info(struct probe_info *pr) +{ + static char *mp; + + mp = find_mount_point(pr->dev); + printf("%s:", pr->dev); + if (pr->uuid) + printf(" UUID=\"%s\"", pr->uuid); + + if (pr->label) + printf(" LABEL=\"%s\"", pr->label); + + if (pr->version) + printf(" VERSION=\"%s\"", pr->version); + + if (mp) { + printf(" MOUNT=\"%s\"", mp); + free(mp); + } + + printf(" TYPE=\"%s\"\n", pr->type); + + return 0; +} + static void mkdir_p(char *dir) { char *l = strrchr(dir, '/'); @@ -623,36 +685,50 @@ static void mkdir_p(char *dir) } } -static void check_filesystem(struct blkid_struct_probe *pr) +static void check_filesystem(struct probe_info *pr) { pid_t pid; struct stat statbuf; - char *e2fsck = "/usr/sbin/e2fsck"; + const char *e2fsck = "/usr/sbin/e2fsck"; + const char *f2fsck = "/usr/sbin/fsck.f2fs"; + const char *dosfsck = "/usr/sbin/dosfsck"; + const char *ckfs; /* UBIFS does not need stuff like fsck */ - if (!strncmp(pr->id->name, "ubifs", 5)) + if (!strncmp(pr->type, "ubifs", 5)) return; - if (strncmp(pr->id->name, "ext", 3)) { - ULOG_ERR("check_filesystem: %s is not supported\n", pr->id->name); + 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 { + ULOG_ERR("check_filesystem: %s is not supported\n", pr->type); return; } - if (stat(e2fsck, &statbuf) < 0) { - ULOG_ERR("check_filesystem: %s not found\n", e2fsck); + if (stat(ckfs, &statbuf) < 0) { + ULOG_ERR("check_filesystem: %s not found\n", ckfs); return; } pid = fork(); if (!pid) { - execl(e2fsck, e2fsck, "-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; waitpid(pid, &status, 0); if (WEXITSTATUS(status)) - ULOG_ERR("check_filesystem: %s returned %d\n", e2fsck, WEXITSTATUS(status)); + ULOG_ERR("check_filesystem: %s returned %d\n", ckfs, WEXITSTATUS(status)); } } @@ -660,7 +736,7 @@ static void handle_swapfiles(bool on) { struct stat s; struct mount *m; - struct blkid_struct_probe *pr; + struct probe_info *pr; vlist_for_each_element(&mounts, m, node) { @@ -675,7 +751,7 @@ static void handle_swapfiles(bool on) if (!pr) continue; - if (!strcmp(pr->id->name, "swap")) { + if (!strcmp(pr->type, "swap")) { if (on) swapon(pr->dev, m->prio); else @@ -686,17 +762,155 @@ static void handle_swapfiles(bool on) } } -static int mount_device(struct blkid_struct_probe *pr, int hotplug) +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; char *device; + char *mp; if (!pr) return -1; device = basename(pr->dev); - if (!strcmp(pr->id->name, "swap")) { + if (!strcmp(pr->type, "swap")) { if (hotplug && !auto_swap) return -1; m = find_swap(pr->uuid, pr->label, device); @@ -709,8 +923,10 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug) if (hotplug && !auto_mount) return -1; - if (find_mount_point(pr->dev)) { - ULOG_ERR("%s is already mounted\n", pr->dev); + mp = find_mount_point(pr->dev); + if (mp) { + ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp); + free(mp); return -1; } @@ -732,18 +948,17 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug) if (check_fs) check_filesystem(pr); - err = mount(pr->dev, target, pr->id->name, 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->id->name, target, err, strerror(err)); + pr->dev, pr->type, target, errno, strerror(errno)); else handle_swapfiles(true); return err; } if (anon_mount) { - char target[] = "/mnt/mmcblk123"; + char target[32]; int err = 0; snprintf(target, sizeof(target), "/mnt/%s", device); @@ -752,10 +967,10 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug) if (check_fs) check_filesystem(pr); - err = mount(pr->dev, target, pr->id->name, 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->id->name, target, err, strerror(err)); + pr->dev, pr->type, target, errno, strerror(errno)); else handle_swapfiles(true); return err; @@ -764,7 +979,7 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug) return 0; } -static int umount_device(struct blkid_struct_probe *pr) +static int umount_device(struct probe_info *pr) { struct mount *m; char *device = basename(pr->dev); @@ -774,7 +989,7 @@ static int umount_device(struct blkid_struct_probe *pr) if (!pr) return -1; - if (!strcmp(pr->id->name, "swap")) + if (!strcmp(pr->type, "swap")) return -1; mp = find_mount_point(pr->dev); @@ -788,11 +1003,12 @@ static int umount_device(struct blkid_struct_probe *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); + free(mp); return err; } @@ -816,8 +1032,9 @@ 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; } else if (strcmp(action, "add")) { ULOG_ERR("Unkown action %s\n", action); @@ -972,7 +1189,7 @@ static int test_fs_support(const char *name) static int check_extroot(char *path) { - struct blkid_struct_probe *pr = NULL; + struct probe_info *pr = NULL; char devpath[32]; #ifdef UBIFS_EXTROOT @@ -1032,7 +1249,7 @@ static int check_extroot(char *path) tag, errno, strerror(errno)); fclose(fp); - if (*uuid || !strcasecmp(uuid, pr->uuid)) + if (*uuid && !strcasecmp(uuid, pr->uuid)) return 0; ULOG_ERR("extroot: UUID mismatch (root: %s, %s: %s)\n", @@ -1053,7 +1270,7 @@ static int mount_extroot(char *cfg) char overlay[] = "/tmp/extroot/overlay"; char mnt[] = "/tmp/extroot/mnt"; char *path = mnt; - struct blkid_struct_probe *pr; + struct probe_info *pr; struct mount *m; int err = -1; @@ -1078,19 +1295,20 @@ static int mount_extroot(char *cfg) if (!pr && delay_root){ ULOG_INFO("extroot: device not present, retrying in %u seconds\n", delay_root); sleep(delay_root); - mkblkdev(); + make_devs(); cache_load(0); pr = find_block_info(m->uuid, m->label, m->device); } if (pr) { - if (strncmp(pr->id->name, "ext", 3) && - strncmp(pr->id->name, "ubifs", 5)) { - ULOG_ERR("extroot: unsupported filesystem %s, try ext4\n", pr->id->name); + if (strncmp(pr->type, "ext", 3) && + strncmp(pr->type, "f2fs", 4) && + strncmp(pr->type, "ubifs", 5)) { + ULOG_ERR("extroot: unsupported filesystem %s, try ext4, f2fs or ubifs\n", pr->type); return -1; } - if (test_fs_support(pr->id->name)) { - ULOG_ERR("extroot: filesystem %s not supported by kernel\n", pr->id->name); + if (test_fs_support(pr->type)) { + ULOG_ERR("extroot: filesystem %s not supported by kernel\n", pr->type); return -1; } @@ -1101,12 +1319,12 @@ static int mount_extroot(char *cfg) if (check_fs) check_filesystem(pr); - err = mount(pr->dev, path, pr->id->name, m->flags, + err = mount(pr->dev, path, pr->type, m->flags, (m->options) ? (m->options) : ("")); if (err) { ULOG_ERR("extroot: mounting %s (%s) on %s failed: %d (%s)\n", - pr->dev, pr->id->name, path, err, strerror(err)); + pr->dev, pr->type, path, errno, strerror(errno)); } else if (m->overlay) { err = check_extroot(path); if (err) @@ -1123,7 +1341,7 @@ static int mount_extroot(char *cfg) static int main_extroot(int argc, char **argv) { - struct blkid_struct_probe *pr; + struct probe_info *pr; char blkdev_path[32] = { 0 }; int err = -1; #ifdef UBIFS_EXTROOT @@ -1138,7 +1356,7 @@ static int main_extroot(int argc, char **argv) return -1; } - mkblkdev(); + make_devs(); cache_load(1); /* enable LOG_INFO messages */ @@ -1153,7 +1371,7 @@ static int main_extroot(int argc, char **argv) find_block_mtd("\"rootfs_data\"", blkdev_path, sizeof(blkdev_path)); if (blkdev_path[0]) { pr = find_block_info(NULL, NULL, blkdev_path); - if (pr && !strcmp(pr->id->name, "jffs2")) { + if (pr && !strcmp(pr->type, "jffs2")) { char cfg[] = "/tmp/jffs_cfg"; /* @@ -1199,7 +1417,7 @@ static int main_extroot(int argc, char **argv) static int main_mount(int argc, char **argv) { - struct blkid_struct_probe *pr; + struct probe_info *pr; if (config_load(NULL)) return -1; @@ -1215,7 +1433,7 @@ static int main_mount(int argc, char **argv) static int main_umount(int argc, char **argv) { - struct blkid_struct_probe *pr; + struct probe_info *pr; if (config_load(NULL)) return -1; @@ -1231,7 +1449,7 @@ static int main_umount(int argc, char **argv) static int main_detect(int argc, char **argv) { - struct blkid_struct_probe *pr; + struct probe_info *pr; cache_load(0); printf("config 'global'\n"); @@ -1250,7 +1468,7 @@ static int main_detect(int argc, char **argv) static int main_info(int argc, char **argv) { int i; - struct blkid_struct_probe *pr; + struct probe_info *pr; cache_load(1); if (argc == 2) { @@ -1267,7 +1485,7 @@ static int main_info(int argc, char **argv) ULOG_ERR("failed to stat %s\n", argv[i]); continue; } - if (!S_ISBLK(s.st_mode)) { + if (!S_ISBLK(s.st_mode) && !(S_ISCHR(s.st_mode) && major(s.st_rdev) == 250)) { ULOG_ERR("%s is not a block device\n", argv[i]); continue; } @@ -1295,7 +1513,7 @@ static int main_swapon(int argc, char **argv) FILE *fp; char *lineptr; size_t s; - struct blkid_struct_probe *pr; + struct probe_info *pr; int flags = 0; int pri; struct stat st; @@ -1320,7 +1538,7 @@ static int main_swapon(int argc, char **argv) case 'a': cache_load(0); list_for_each_entry(pr, &devices, list) { - if (strcmp(pr->id->name, "swap")) + if (strcmp(pr->type, "swap")) continue; if (swapon(pr->dev, 0)) ULOG_ERR("failed to swapon %s\n", pr->dev); @@ -1434,6 +1652,14 @@ int main(int argc, char **argv) if (!strcmp(argv[1], "umount")) return main_umount(argc, argv); + + if (!strcmp(argv[1], "remount")) { + int ret = main_umount(argc, argv); + + if (!ret) + ret = main_mount(argc, argv); + return ret; + } } ULOG_ERR("Usage: block \n");