chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tmpfiles: always recreate the most basic directory structure in /var
[elogind.git]
/
src
/
readahead
/
readahead-replay.c
diff --git
a/src/readahead/readahead-replay.c
b/src/readahead/readahead-replay.c
index 6e6db601d45a101356ee9cadb907104810ba184d..f46dc3baeb9f37e302fdc9341eb445e5fbc722bc 100644
(file)
--- a/
src/readahead/readahead-replay.c
+++ b/
src/readahead/readahead-replay.c
@@
-47,8
+47,8
@@
static ReadaheadShared *shared = NULL;
static int unpack_file(FILE *pack) {
static ReadaheadShared *shared = NULL;
static int unpack_file(FILE *pack) {
+ _cleanup_close_ int fd = -1;
char fn[PATH_MAX];
char fn[PATH_MAX];
- int r = 0, fd = -1;
bool any = false;
struct stat st;
uint64_t inode;
bool any = false;
struct stat st;
uint64_t inode;
@@
-63,28
+63,22
@@
static int unpack_file(FILE *pack) {
fd = open(fn, O_RDONLY|O_CLOEXEC|O_NOATIME|O_NOCTTY|O_NOFOLLOW);
if (fd < 0) {
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);
log_warning("open(%s) failed: %m", fn);
- } else if (file_verify(fd, fn, arg_file_size_max, &st) <= 0) {
- close_nointr_nofail(fd);
- fd = -1;
- }
+ } else if (file_verify(fd, fn, arg_file_size_max, &st) <= 0)
+ fd = safe_close(fd);
if (fread(&inode, sizeof(inode), 1, pack) != 1) {
log_error("Premature end of pack file.");
if (fread(&inode, sizeof(inode), 1, pack) != 1) {
log_error("Premature end of pack file.");
- r = -EIO;
- goto finish;
+ return -EIO;
}
if (fd >= 0) {
/* If the inode changed the file got deleted, so just
* ignore this entry */
}
if (fd >= 0) {
/* If the inode changed the file got deleted, so just
* ignore this entry */
- if (st.st_ino != (uint64_t) inode) {
- close_nointr_nofail(fd);
- fd = -1;
- }
+ if (st.st_ino != (uint64_t) inode)
+ fd = safe_close(fd);
}
for (;;) {
}
for (;;) {
@@
-93,8
+87,7
@@
static int unpack_file(FILE *pack) {
if (fread(&b, sizeof(b), 1, pack) != 1 ||
fread(&c, sizeof(c), 1, pack) != 1) {
log_error("Premature end of pack file.");
if (fread(&b, sizeof(b), 1, pack) != 1 ||
fread(&c, sizeof(c), 1, pack) != 1) {
log_error("Premature end of pack file.");
- r = -EIO;
- goto finish;
+ return -EIO;
}
if (b == 0 && c == 0)
}
if (b == 0 && c == 0)
@@
-102,19
+95,19
@@
static int unpack_file(FILE *pack) {
if (c <= b) {
log_error("Invalid pack file.");
if (c <= b) {
log_error("Invalid pack file.");
- r = -EIO;
- goto finish;
+ return -EIO;
}
log_debug("%s: page %u to %u", fn, b, c);
any = true;
}
log_debug("%s: page %u to %u", fn, b, c);
any = true;
- if (fd >= 0)
+ if (fd >= 0)
{
if (posix_fadvise(fd, b * page_size(), (c - b) * page_size(), POSIX_FADV_WILLNEED) < 0) {
log_warning("posix_fadvise() failed: %m");
if (posix_fadvise(fd, b * page_size(), (c - b) * page_size(), POSIX_FADV_WILLNEED) < 0) {
log_warning("posix_fadvise() failed: %m");
-
goto finish
;
+
return -errno
;
}
}
+ }
}
if (!any && fd >= 0) {
}
if (!any && fd >= 0) {
@@
-124,72
+117,61
@@
static int unpack_file(FILE *pack) {
if (posix_fadvise(fd, 0, st.st_size, POSIX_FADV_WILLNEED) < 0) {
log_warning("posix_fadvise() failed: %m");
if (posix_fadvise(fd, 0, st.st_size, POSIX_FADV_WILLNEED) < 0) {
log_warning("posix_fadvise() failed: %m");
-
goto finish
;
+
return -errno
;
}
}
}
}
-finish:
- if (fd >= 0)
- close_nointr_nofail(fd);
-
- return r;
+ return 0;
}
static int replay(const char *root) {
}
static int replay(const char *root) {
- FILE *pack = NULL;
- char line[LINE_MAX];
- int r = 0;
- char *pack_fn = NULL;
- int c;
+ _cleanup_close_ int inotify_fd = -1;
+ _cleanup_free_ char *pack_fn = NULL;
+ _cleanup_fclose_ FILE *pack = NULL;
bool on_ssd, ready = false;
bool on_ssd, ready = false;
-
int prio
;
- int
inotify_fd = -1
;
+
char line[LINE_MAX]
;
+ int
prio, c
;
assert(root);
block_bump_request_nr(root);
assert(root);
block_bump_request_nr(root);
- if (asprintf(&pack_fn, "%s/.readahead", root) < 0) {
- log_error("Out of memory");
- r = -ENOMEM;
- goto finish;
- }
+ if (asprintf(&pack_fn, "%s/.readahead", root) < 0)
+ return log_oom();
- if ((!(pack = fopen(pack_fn, "re")))) {
- if (errno == ENOENT)
+ pack = fopen(pack_fn, "re");
+ if (!pack) {
+ if (errno == ENOENT) {
log_debug("No pack file found.");
log_debug("No pack file found.");
- else {
- log_error("Failed to open pack file: %m");
- r = -errno;
+ return 0;
}
}
- goto finish;
+ log_error("Failed to open pack file: %m");
+ return -errno;
}
posix_fadvise(fileno(pack), 0, 0, POSIX_FADV_WILLNEED);
}
posix_fadvise(fileno(pack), 0, 0, POSIX_FADV_WILLNEED);
- if ((inotify_fd = open_inotify()) < 0) {
- r = inotify_fd;
- goto finish;
- }
+ inotify_fd = open_inotify();
+ if (inotify_fd < 0)
+ return inotify_fd;
- if (!
(fgets(line, sizeof(line), pack)
)) {
+ if (!
fgets(line, sizeof(line), pack
)) {
log_error("Premature end of pack file.");
log_error("Premature end of pack file.");
- r = -EIO;
- goto finish;
+ return -EIO;
}
char_array_0(line);
if (!streq(line, CANONICAL_HOST READAHEAD_PACK_FILE_VERSION)) {
log_debug("Pack file host or version type mismatch.");
}
char_array_0(line);
if (!streq(line, CANONICAL_HOST READAHEAD_PACK_FILE_VERSION)) {
log_debug("Pack file host or version type mismatch.");
- goto
finish
;
+ goto
done
;
}
}
- if ((c = getc(pack)) == EOF) {
+ c = getc(pack);
+ if (c == EOF) {
log_debug("Premature end of pack file.");
log_debug("Premature end of pack file.");
- r = -EIO;
- goto finish;
+ return -EIO;
}
/* We do not retest SSD here, so that we can start replaying
}
/* We do not retest SSD here, so that we can start replaying
@@
-225,11
+207,11
@@
static int replay(const char *root) {
int k;
ssize_t n;
int k;
ssize_t n;
- if ((n = read(inotify_fd, &inotify_buffer, sizeof(inotify_buffer))) < 0) {
+ n = read(inotify_fd, &inotify_buffer, sizeof(inotify_buffer));
+ if (n < 0) {
if (errno != EINTR && errno != EAGAIN) {
log_error("Failed to read inotify event: %m");
if (errno != EINTR && errno != EAGAIN) {
log_error("Failed to read inotify event: %m");
- r = -errno;
- goto finish;
+ return -errno;
}
} else {
struct inotify_event *e = (struct inotify_event*) inotify_buffer;
}
} else {
struct inotify_event *e = (struct inotify_event*) inotify_buffer;
@@
-250,10
+232,9
@@
static int replay(const char *root) {
}
}
}
}
- if ((k = unpack_file(pack)) < 0) {
- r = k;
- goto finish;
- }
+ k = unpack_file(pack);
+ if (k < 0)
+ return k;
if (!ready) {
/* We delay the ready notification until we
if (!ready) {
/* We delay the ready notification until we
@@
-264,27
+245,16
@@
static int replay(const char *root) {
}
done:
}
done:
- if (!ready)
- sd_notify(0, "READY=1");
-
if (ferror(pack)) {
log_error("Failed to read pack file.");
if (ferror(pack)) {
log_error("Failed to read pack file.");
- r = -EIO;
- goto finish;
+ return -EIO;
}
}
- log_debug("Done.");
-
-finish:
- if (pack)
- fclose(pack);
-
- if (inotify_fd >= 0)
- close_nointr_nofail(inotify_fd);
-
- free(pack_fn);
+ if (!ready)
+ sd_notify(0, "READY=1");
- return r;
+ log_debug("Done.");
+ return 0;
}
int main_replay(const char *root) {
}
int main_replay(const char *root) {