From: Harald Hoyer Date: Fri, 24 Sep 2010 10:54:05 +0000 (+0200) Subject: readahead-replay: use posix_fadvise instead of readahead X-Git-Tag: v11~79 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=6e66797af44164c002127c4664064bf60a2fc13b readahead-replay: use posix_fadvise instead of readahead --- diff --git a/src/readahead-replay.c b/src/readahead-replay.c index a5a2936b3..32941c144 100644 --- a/src/readahead-replay.c +++ b/src/readahead-replay.c @@ -89,8 +89,8 @@ static int unpack_file(FILE *pack) { any = true; if (fd >= 0) - if (readahead(fd, b * PAGE_SIZE, (c - b) * PAGE_SIZE) < 0) { - log_warning("readahead() 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; } } @@ -100,8 +100,8 @@ static int unpack_file(FILE *pack) { * intended to mean that the whole file shall be * read */ - if (readahead(fd, 0, st.st_size) < 0) { - log_warning("readahead() failed: %m"); + if (posix_fadvise(fd, 0, st.st_size, POSIX_FADV_WILLNEED) < 0) { + log_warning("posix_fadvise() failed: %m"); goto finish; } }