chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machined: ignore spurious error
[elogind.git]
/
src
/
core
/
mount.c
diff --git
a/src/core/mount.c
b/src/core/mount.c
index 3029cfd4d81dd74b16bf3266519720ab33a26d94..110eafdc49a91bb132fe0e2f71973a8b336a4fa8 100644
(file)
--- a/
src/core/mount.c
+++ b/
src/core/mount.c
@@
-1447,7
+1447,6
@@
static int mount_add_one(
goto fail;
}
goto fail;
}
-
if (m->running_as == SYSTEMD_SYSTEM) {
const char* target;
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 (;;) {
* internal behaviour of libmount here. */
for (;;) {
- u
int8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event)
;
+ u
nion inotify_event_buffer buffer
;
struct inotify_event *e;
ssize_t l;
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;
if (l < 0) {
if (errno == EAGAIN || errno == EINTR)
break;