X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount.c;h=110eafdc49a91bb132fe0e2f71973a8b336a4fa8;hb=e5f5b5b9c92d59ef3cb5169982cb6f436c9206fa;hp=3029cfd4d81dd74b16bf3266519720ab33a26d94;hpb=7d54a03a877e9c3f3f3087401ac4ccc1e12c78ea;p=elogind.git diff --git a/src/core/mount.c b/src/core/mount.c index 3029cfd4d..110eafdc4 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1447,7 +1447,6 @@ static int mount_add_one( goto fail; } - if (m->running_as == SYSTEMD_SYSTEM) { const char* target; @@ -1702,11 +1701,11 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents, * internal behaviour of libmount here. */ for (;;) { - uint8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event); + union inotify_event_buffer buffer; struct inotify_event *e; ssize_t l; - l = read(fd, buffer, sizeof(buffer)); + l = read(fd, &buffer, sizeof(buffer)); if (l < 0) { if (errno == EAGAIN || errno == EINTR) break;