X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Freadahead%2Freadahead-replay.c;h=a6529f8bace696c8a01393dcfafe7e62a9b71ebf;hb=4019a16d5b65633e5f6d671c16d3215d7f7f29fc;hp=7c263f6e5382e4053795278bebc762996ee055e8;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c index 7c263f6e5..a6529f8ba 100644 --- a/src/readahead/readahead-replay.c +++ b/src/readahead/readahead-replay.c @@ -132,8 +132,7 @@ static int replay(const char *root) { assert(root); - write_one_line_file("/proc/self/oom_score_adj", "1000"); - bump_request_nr(root); + block_bump_request_nr(root); if (asprintf(&pack_fn, "%s/.readahead", root) < 0) { log_error("Out of memory"); @@ -350,7 +349,8 @@ int main(int argc, char*argv[]) { umask(0022); - if ((r = parse_argv(argc, argv)) <= 0) + r = parse_argv(argc, argv); + if (r <= 0) return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; root = optind < argc ? argv[optind] : "/"; @@ -360,12 +360,8 @@ int main(int argc, char*argv[]) { return 0; } - if (detect_virtualization(NULL) > 0) { - log_info("Disabling readahead replay due to execution in virtualized environment."); - return 0; - } - - if (!(shared = shared_get())) + shared = shared_get(); + if (!shared) return 1; shared->replay = getpid();