X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Freadahead%2Freadahead-replay.c;h=cb04e5f9cde051fb2a1965be2fb9450ee39d0b90;hb=fb818b2ea194ec182aa3e776d38883dc615910a1;hp=f90821e831e67b28f6ad363b33d1e8f0ccf29ebf;hpb=669241a076108e0483d7d8475beaa506106d077e;p=elogind.git diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c index f90821e83..cb04e5f9c 100644 --- a/src/readahead/readahead-replay.c +++ b/src/readahead/readahead-replay.c @@ -64,7 +64,7 @@ static int unpack_file(FILE *pack) { fd = open(fn, O_RDONLY|O_CLOEXEC|O_NOATIME|O_NOCTTY|O_NOFOLLOW); if (fd < 0) { - if (errno != ENOENT && errno != EPERM && errno != EACCES) + if (errno != ENOENT && errno != EPERM && errno != EACCES && errno != ELOOP) log_warning("open(%s) failed: %m", fn); } else if (file_verify(fd, fn, arg_file_size_max, &st) <= 0) { @@ -150,8 +150,7 @@ static int replay(const char *root) { block_bump_request_nr(root); if (asprintf(&pack_fn, "%s/.readahead", root) < 0) { - log_error("Out of memory."); - r = -ENOMEM; + r = log_oom(); goto finish; }