#include <linux/auto_fs4.h>
#include <libubox/uloop.h>
+#include <libubox/utils.h>
#include <libubox/vlist.h>
#include <libubox/ulog.h>
#include <libubox/avl-cmp.h>
mp = find_mount_point(dev, 0);
free(dev);
- if (mp)
- return mp;
-
- if (asprintf(&dev, "/dev/mapper/%s", device) == -1)
- exit(ENOMEM);
-
- 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;
}
}
static int send_block_notification(struct ubus_context *ctx, const char *action,
- const char *devname);
+ const char *devname, const char *target);
static int hotplug_call_mount(struct ubus_context *ctx, const char *action,
const char *devname, uloop_process_handler cb, void *priv)
{
pid = fork();
switch (pid) {
case -1:
+ if (c)
+ free(c);
+
err = -errno;
ULOG_ERR("fork() failed\n");
return err;
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);
}
static void device_mount_remove(struct ubus_context *ctx, struct device *device)
{
- hotplug_call_mount(ctx, "remove", device->name,
+ static const char *action = "remove";
+
+ hotplug_call_mount(ctx, action, device->name,
device_mount_remove_hotplug_cb, device);
+
+ send_block_notification(ctx, action, device->name, device->target);
}
static void device_mount_add(struct ubus_context *ctx, struct device *device)
{
struct stat st;
- char *path;
+ char *path, *tmp;
if (asprintf(&path, "/tmp/run/blockd/%s", device->name) == -1)
exit(ENOMEM);
else if (S_ISDIR(st.st_mode))
rmdir(device->target);
}
- if (symlink(path, device->target))
- ULOG_ERR("failed to symlink %s->%s (%d) - %m\n", device->target, path, errno);
- else
- hotplug_call_mount(ctx, "add", device->name, NULL, NULL);
+ 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 {
+ static const char *action = "add";
+ hotplug_call_mount(ctx, action, device->name, NULL, NULL);
+ send_block_notification(ctx, action, device->name, device->target);
+ }
free(path);
}
vlist_add(&devices, &device->node, device->name);
- if (old && !device_move(old, device)) {
- if (device->autofs) {
- device_mount_remove(ctx, old);
- device_mount_add(ctx, device);
- } else {
- block("mount", NULL, NULL);
- }
+ if (old && device_move(old, device)) {
+ device_mount_remove(ctx, old);
+ device_mount_add(ctx, device);
+ if (!device->autofs)
+ block("mount", NULL, NULL, 0, NULL);
} else if (device->autofs) {
device_mount_add(ctx, device);
}
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
{
+ static const char *action = "add";
struct blob_attr *data[__MOUNT_MAX];
struct device *device;
char *devname;
if (!device)
return UBUS_STATUS_UNKNOWN_ERROR;
- hotplug_call_mount(ctx, "add", device->name, NULL, NULL);
+ hotplug_call_mount(ctx, action, device->name, NULL, NULL);
+ send_block_notification(ctx, action, device->name, device->target);
return 0;
}
{
struct blob_attr *data[__MOUNT_MAX];
struct blockd_umount_context *c;
+ static const char *action = "remove";
char *devname;
+ static char oldtarget[PATH_MAX];
+ struct device *device;
int err;
blobmsg_parse(mount_policy, __MOUNT_MAX, data, blob_data(msg), blob_len(msg));
return UBUS_STATUS_INVALID_ARGUMENT;
devname = blobmsg_get_string(data[MOUNT_DEVICE]);
+ device = vlist_find(&devices, devname, device, node);
+ if (device) {
+ strncpy(oldtarget, device->target, sizeof(oldtarget)-1);
+ oldtarget[PATH_MAX - 1] = '\0';
+ }
c = calloc(1, sizeof(*c));
if (!c)
c->ctx = ctx;
ubus_defer_request(ctx, req, &c->req);
- err = hotplug_call_mount(ctx, "remove", devname, blockd_umount_hotplug_cb, c);
+ err = hotplug_call_mount(ctx, action, devname, blockd_umount_hotplug_cb, c);
if (err) {
free(c);
return UBUS_STATUS_UNKNOWN_ERROR;
}
+ send_block_notification(ctx, action, devname, oldtarget);
+
return 0;
}
/* 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)
+ const char *devname, const char *target)
{
struct blob_buf buf = { 0 };
char evname[16] = "mount.";
strncat(evname, action, sizeof(evname) - 1);
blob_buf_init(&buf, 0);
- blobmsg_add_string(&buf, "devname", devname);
+
+ if (devname)
+ blobmsg_add_string(&buf, "device", devname);
+
+ if (target)
+ blobmsg_add_string(&buf, "target", target);
err = ubus_notify(ctx, &block_object, evname, buf.head, -1);
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];
return 0;
}
+static void blockd_startup_cb(struct uloop_process *p, int stat)
+{
+ send_block_notification(&conn.ctx, "ready", NULL, 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 = {
projects / project / fstools.git / blobdiff