-#include <sys/types.h>
+#define _GNU_SOURCE
#include <sys/stat.h>
#include <sys/mount.h>
#include <sys/wait.h>
static char*
_find_mount_point(char *device)
{
- char dev[32] = { 0 };
+ char *dev, *mp;
- snprintf(dev, sizeof(dev), "/dev/%s", device);
+ if (asprintf(&dev, "/dev/%s", device) == -1)
+ exit(ENOMEM);
- return find_mount_point(dev, 0);
+ mp = find_mount_point(dev, 0);
+ free(dev);
+
+ return mp;
}
static int
-block(char *cmd, char *action, char *device)
+block(char *cmd, char *action, char *device, int sync, struct uloop_process *process)
{
pid_t pid = fork();
- int ret = -1;
+ int ret = sync;
int status;
char *argv[5] = { 0 };
int a = 0;
break;
case 0:
+ uloop_end();
+
argv[a++] = "/sbin/block";
argv[a++] = cmd;
argv[a++] = action;
exit(EXIT_FAILURE);
default:
- waitpid(pid, &status, 0);
- ret = WEXITSTATUS(status);
- if (ret)
- ULOG_ERR("failed to run block. %s/%s\n", action, device);
+ if (!sync && process) {
+ process->pid = pid;
+ uloop_process_add(process);
+ } else if (sync) {
+ waitpid(pid, &status, 0);
+ ret = WEXITSTATUS(status);
+ if (ret)
+ ULOG_ERR("failed to run block. %s/%s\n", action, device);
+ }
break;
}
return ret;
}
-static int hotplug_call_mount(const char *action, const char *devname,
- uloop_process_handler cb, void *priv)
+static int send_block_notification(struct ubus_context *ctx, const char *action,
+ const char *devname);
+static int hotplug_call_mount(struct ubus_context *ctx, const char *action,
+ const char *devname, uloop_process_handler cb, void *priv)
{
char * const argv[] = { "hotplug-call", "mount", NULL };
struct hotplug_context *c = NULL;
break;
}
+ send_block_notification(ctx, action, devname);
+
return 0;
}
mp = _find_mount_point(device->name);
if (mp) {
- block("autofs", "remove", device->name);
+ block("autofs", "remove", device->name, 0, NULL);
free(mp);
}
free(hctx);
}
-static void device_mount_remove(struct device *device)
+static void device_mount_remove(struct ubus_context *ctx, struct device *device)
{
- hotplug_call_mount("remove", device->name,
+ hotplug_call_mount(ctx, "remove", device->name,
device_mount_remove_hotplug_cb, device);
}
-static void device_mount_add(struct device *device)
+static void device_mount_add(struct ubus_context *ctx, struct device *device)
{
struct stat st;
- char path[64];
+ char *path, *tmp;
+
+ if (asprintf(&path, "/tmp/run/blockd/%s", device->name) == -1)
+ exit(ENOMEM);
- snprintf(path, sizeof(path), "/tmp/run/blockd/%s", device->name);
if (!lstat(device->target, &st)) {
if (S_ISLNK(st.st_mode))
unlink(device->target);
else if (S_ISDIR(st.st_mode))
rmdir(device->target);
}
+
+ tmp = strrchr(device->target, '/');
+ if (tmp && tmp != device->target && tmp != &device->target[strlen(path)-1]) {
+ *tmp = '\0';
+ mkdir_p(device->target, 0755);
+ *tmp = '/';
+ }
+
if (symlink(path, device->target))
ULOG_ERR("failed to symlink %s->%s (%d) - %m\n", device->target, path, errno);
else
- hotplug_call_mount("add", device->name, NULL, NULL);
+ hotplug_call_mount(ctx, "add", device->name, NULL, NULL);
+
+ free(path);
}
static int
device_move(struct device *device_o, struct device *device_n)
{
- char path[64];
+ char *path;
if (device_o->autofs != device_n->autofs)
return -1;
if (device_o->autofs) {
unlink(device_o->target);
- snprintf(path, sizeof(path), "/tmp/run/blockd/%s", device_n->name);
+ if (asprintf(&path, "/tmp/run/blockd/%s", device_n->name) == -1)
+ exit(ENOMEM);
+
if (symlink(path, device_n->target))
ULOG_ERR("failed to symlink %s->%s (%d) - %m\n", device_n->target, path, errno);
+
+ free(path);
} else {
mkdir(device_n->target, 0755);
if (mount(device_o->target, device_n->target, NULL, MS_MOVE, NULL))
struct blob_attr *_msg;
char *devname, *_name;
char *target = NULL, *__target;
- char _target[32];
+ char *_target = NULL;
blobmsg_parse(mount_policy, __MOUNT_MAX, data, blob_data(msg), blob_len(msg));
if (data[MOUNT_TARGET]) {
target = blobmsg_get_string(data[MOUNT_TARGET]);
} else {
- snprintf(_target, sizeof(_target), "/mnt/%s",
- blobmsg_get_string(data[MOUNT_DEVICE]));
+ if (asprintf(&_target, "/mnt/%s",
+ blobmsg_get_string(data[MOUNT_DEVICE])) == -1)
+ exit(ENOMEM);
+
target = _target;
}
device = calloc_a(sizeof(*device), &_msg, blob_raw_len(msg),
&_name, strlen(devname) + 1, &__target, strlen(target) + 1);
- if (!device)
+ if (!device) {
+ if (_target)
+ free(_target);
+
return UBUS_STATUS_UNKNOWN_ERROR;
+ }
if (data[MOUNT_REMOVE]) {
vlist_delete(&devices, &device->node);
if (device->autofs)
- device_mount_remove(device);
+ device_mount_remove(ctx, device);
else
free(device);
+
+ if (_target)
+ free(_target);
} else {
struct device *old = vlist_find(&devices, devname, device, node);
strcpy(_name, devname);
device->target = __target;
strcpy(__target, target);
+ if (_target)
+ free(_target);
vlist_add(&devices, &device->node, device->name);
if (old && !device_move(old, device)) {
if (device->autofs) {
- device_mount_remove(old);
- device_mount_add(device);
+ device_mount_remove(ctx, old);
+ device_mount_add(ctx, device);
} else {
- block("mount", NULL, NULL);
+ block("mount", NULL, NULL, 0, NULL);
}
} else if (device->autofs) {
- device_mount_add(device);
+ device_mount_add(ctx, device);
}
}
if (!device)
return UBUS_STATUS_UNKNOWN_ERROR;
- hotplug_call_mount("add", device->name, NULL, NULL);
+ hotplug_call_mount(ctx, "add", device->name, NULL, NULL);
return 0;
}
c->ctx = ctx;
ubus_defer_request(ctx, req, &c->req);
- err = hotplug_call_mount("remove", devname, blockd_umount_hotplug_cb, c);
+ err = hotplug_call_mount(ctx, "remove", devname, blockd_umount_hotplug_cb, c);
if (err) {
free(c);
return UBUS_STATUS_UNKNOWN_ERROR;
.n_methods = ARRAY_SIZE(block_methods),
};
+/* send ubus event for successful mounts, useful for procd triggers */
+static int send_block_notification(struct ubus_context *ctx, const char *action,
+ const char *devname)
+{
+ struct blob_buf buf = { 0 };
+ char evname[16] = "mount.";
+ int err;
+
+ if (!ctx)
+ return -ENXIO;
+
+ strncat(evname, action, sizeof(evname) - 1);
+
+ blob_buf_init(&buf, 0);
+
+ if (devname)
+ blobmsg_add_string(&buf, "devname", devname);
+
+ err = ubus_notify(ctx, &block_object, evname, buf.head, -1);
+
+ return err;
+}
+
static void
ubus_connect_handler(struct ubus_context *ctx)
{
pkt = &pktu.missing_indirect;
ULOG_ERR("kernel is requesting a mount -> %s\n", pkt->name);
if (lstat(pkt->name, &st) == -1)
- if (block("autofs", "add", (char *)pkt->name))
+ if (block("autofs", "add", (char *)pkt->name, 1, NULL))
cmd = AUTOFS_IOC_FAIL;
if (ioctl(fd_autofs_write, cmd, pkt->wait_queue_token) < 0)
struct autofs_packet_expire pkt;
while (ioctl(fd_autofs_write, AUTOFS_IOC_EXPIRE, &pkt) == 0)
- block("autofs", "remove", pkt.name);
+ block("autofs", "remove", pkt.name, 1, NULL);
uloop_timeout_set(t, AUTOFS_EXPIRE_TIMER);
}
static int autofs_mount(void)
{
- int autofs_timeout = AUTOFS_TIMEOUT;
+ unsigned long autofs_timeout = AUTOFS_TIMEOUT;
int kproto_version;
int pipefd[2];
char source[64];
uloop_timeout_set(&autofs_expire_timer, AUTOFS_EXPIRE_TIMER);
- fcntl(fd_autofs_write, F_SETFD, fcntl(fd_autofs_write, F_GETFD) | FD_CLOEXEC);
- fcntl(fd_autofs_read.fd, F_SETFD, fcntl(fd_autofs_read.fd, F_GETFD) | FD_CLOEXEC);
+ fcntl(fd_autofs_write, F_SETFD, fcntl(fd_autofs_write, F_GETFD) | FD_CLOEXEC);
+ fcntl(fd_autofs_read.fd, F_SETFD, fcntl(fd_autofs_read.fd, F_GETFD) | FD_CLOEXEC);
return 0;
}
+static void blockd_startup_cb(struct uloop_process *p, int stat)
+{
+ send_block_notification(&conn.ctx, "ready", NULL);
+}
+
+static struct uloop_process startup_process = {
+ .cb = blockd_startup_cb,
+};
+
static void blockd_startup(struct uloop_timeout *t)
{
- block("autofs", "start", NULL);
+ block("autofs", "start", NULL, 0, &startup_process);
}
struct uloop_timeout startup = {
int main(int argc, char **argv)
{
+ /* make sure blockd is in it's own POSIX process group */
+ setpgrp();
+
ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "blockd");
uloop_init();
projects / project / fstools.git / blobdiff