***/
#include <errno.h>
-#include <libudev.h>
#include <stdlib.h>
#include <string.h>
#include <sys/sysinfo.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <unistd.h>
+#include <libudev.h>
#include "log.h"
#include "readahead-common.h"
if (stat(p, &st) < 0)
return -errno;
+ if (major(st.st_dev) == 0)
+ return false;
+
if (!(udev = udev_new()))
return -ENOMEM;
return b;
}
+int fs_on_read_only(const char *p) {
+ struct stat st;
+ struct udev *udev = NULL;
+ struct udev_device *udev_device = NULL;
+ bool b = false;
+ const char *read_only;
+
+ assert(p);
+
+ if (stat(p, &st) < 0)
+ return -errno;
+
+ if (major(st.st_dev) == 0)
+ return false;
+
+ if (!(udev = udev_new()))
+ return -ENOMEM;
+
+ if (!(udev_device = udev_device_new_from_devnum(udev, 'b', st.st_dev)))
+ goto finish;
+
+ if ((read_only = udev_device_get_sysattr_value(udev_device, "ro")))
+ if ((b = streq(read_only, "1")))
+ goto finish;
+
+finish:
+ if (udev_device)
+ udev_device_unref(udev_device);
+
+ if (udev)
+ udev_unref(udev);
+
+ return b;
+}
+
bool enough_ram(void) {
struct sysinfo si;
assert_se(sysinfo(&si) >= 0);
- return si.totalram > 127 * 1024*1024; /* Enable readahead only
- * with at least 128MB
- * memory */
+ /* Enable readahead only with at least 128MB memory */
+ return si.totalram > 127 * 1024*1024 / si.mem_unit;
}
int open_inotify(void) {
return -errno;
}
- mkdir("/dev/.systemd", 0755);
- mkdir("/dev/.systemd/readahead", 0755);
+ mkdir("/run/systemd", 0755);
+ mkdir("/run/systemd/readahead", 0755);
- if (inotify_add_watch(fd, "/dev/.systemd/readahead", IN_CREATE) < 0) {
- log_error("Failed to watch /dev/.systemd/readahead: %m");
+ if (inotify_add_watch(fd, "/run/systemd/readahead", IN_CREATE) < 0) {
+ log_error("Failed to watch /run/systemd/readahead: %m");
close_nointr_nofail(fd);
return -errno;
}
int fd;
ReadaheadShared *m = NULL;
- mkdir("/dev/.systemd", 0755);
- mkdir("/dev/.systemd/readahead", 0755);
+ mkdir("/run/systemd", 0755);
+ mkdir("/run/systemd/readahead", 0755);
- if ((fd = open("/dev/.systemd/readahead/shared", O_CREAT|O_RDWR|O_CLOEXEC, 0644)) < 0) {
+ if ((fd = open("/run/systemd/readahead/shared", O_CREAT|O_RDWR|O_CLOEXEC, 0644)) < 0) {
log_error("Failed to create shared memory segment: %m");
goto finish;
}
return m;
}
+
+#define BUMP_REQUEST_NR (16*1024)
+
+int bump_request_nr(const char *p) {
+ struct stat st;
+ struct udev *udev = NULL;
+ struct udev_device *udev_device = NULL, *look_at = NULL;
+ const char *nr_requests;
+ uint64_t u;
+ char nr[64], *ap = NULL;
+ int r;
+
+ assert(p);
+
+ if (stat(p, &st) < 0)
+ return -errno;
+
+ if (major(st.st_dev) == 0)
+ return 0;
+
+ if (!(udev = udev_new()))
+ return -ENOMEM;
+
+ if (!(udev_device = udev_device_new_from_devnum(udev, 'b', st.st_dev))) {
+ r = -ENOENT;
+ goto finish;
+ }
+
+ look_at = udev_device;
+ if (!(nr_requests = udev_device_get_sysattr_value(look_at, "queue/nr_requests"))) {
+
+ /* Hmm, if the block device doesn't have a queue
+ * subdir, the let's look in the parent */
+ look_at = udev_device_get_parent(udev_device);
+ nr_requests = udev_device_get_sysattr_value(look_at, "queue/nr_requests");
+ }
+
+ if (!nr_requests) {
+ r = -ENOENT;
+ goto finish;
+ }
+
+ if (safe_atou64(nr_requests, &u) >= 0 && u >= BUMP_REQUEST_NR) {
+ r = 0;
+ goto finish;
+ }
+
+ if (asprintf(&ap, "%s/queue/nr_requests", udev_device_get_syspath(look_at)) < 0) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ snprintf(nr, sizeof(nr), "%lu", (unsigned long) BUMP_REQUEST_NR);
+
+ if ((r = write_one_line_file(ap, nr)) < 0)
+ goto finish;
+
+ log_info("Bumped block_nr parameter of %s to %lu. This is a temporary hack and should be removed one day.", udev_device_get_devnode(look_at), (unsigned long) BUMP_REQUEST_NR);
+ r = 1;
+
+finish:
+ if (udev_device)
+ udev_device_unref(udev_device);
+
+ if (udev)
+ udev_unref(udev);
+
+ free(ap);
+
+ return r;
+}