diff options
author | Steve Dickson <steved@redhat.com> | 2022-04-19 10:58:16 -0400 |
---|---|---|
committer | Steve Dickson <steved@redhat.com> | 2022-04-19 15:50:29 -0400 |
commit | 15ea4f1090e5ac1f41a3fa43c5e30dfa2611085e (patch) | |
tree | 02696bb2a61bc3c1fce81273caafaf4a99255adc | |
parent | 6011418c3e4e37dd433a6d7560f220d442943f84 (diff) | |
download | nfs-utils-15ea4f1090e5ac1f41a3fa43c5e30dfa2611085e.tar.gz |
nfsrahead: only set readahead for nfs devices.
Limit setting the readahead for nfs devices.
Signed-off-by: Thiago Becker <tbecker@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r-- | tools/nfsrahead/99-nfs.rules | 2 | ||||
-rw-r--r-- | tools/nfsrahead/99-nfs.rules.in | 2 | ||||
-rw-r--r-- | tools/nfsrahead/Makefile.am | 1 | ||||
-rw-r--r-- | tools/nfsrahead/main.c | 128 |
4 files changed, 131 insertions, 2 deletions
diff --git a/tools/nfsrahead/99-nfs.rules b/tools/nfsrahead/99-nfs.rules index f5a7660..c74914b 100644 --- a/tools/nfsrahead/99-nfs.rules +++ b/tools/nfsrahead/99-nfs.rules @@ -1 +1 @@ -SUBSYSTEM=="bdi", ACTION=="add", PROGRAM="/usr/libexec/nfsrahead", ATTR{read_ahead_kb}="%c" +SUBSYSTEM=="bdi", ACTION=="add", PROGRAM="/usr/libexec/nfsrahead %k", ATTR{read_ahead_kb}="%c" diff --git a/tools/nfsrahead/99-nfs.rules.in b/tools/nfsrahead/99-nfs.rules.in index 7d55b40..648813c 100644 --- a/tools/nfsrahead/99-nfs.rules.in +++ b/tools/nfsrahead/99-nfs.rules.in @@ -1 +1 @@ -SUBSYSTEM=="bdi", ACTION=="add", PROGRAM="_libexecdir_/nfsrahead", ATTR{read_ahead_kb}="%c" +SUBSYSTEM=="bdi", ACTION=="add", PROGRAM="_libexecdir_/nfsrahead %k", ATTR{read_ahead_kb}="%c" diff --git a/tools/nfsrahead/Makefile.am b/tools/nfsrahead/Makefile.am index 58a2ea2..0daddc4 100644 --- a/tools/nfsrahead/Makefile.am +++ b/tools/nfsrahead/Makefile.am @@ -1,5 +1,6 @@ libexec_PROGRAMS = nfsrahead nfsrahead_SOURCES = main.c +nfsrahead_LDFLAGS= -lmount udev_rulesdir = /usr/lib/udev/rules.d/ udev_rules_DATA = 99-nfs.rules diff --git a/tools/nfsrahead/main.c b/tools/nfsrahead/main.c index 0359ace..8fe6d64 100644 --- a/tools/nfsrahead/main.c +++ b/tools/nfsrahead/main.c @@ -1,7 +1,135 @@ #include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <errno.h> + +#include <libmount/libmount.h> +#include <sys/sysmacros.h> + +#ifndef MOUNTINFO_PATH +#define MOUNTINFO_PATH "/proc/self/mountinfo" +#endif + +/* Device information from the system */ +struct device_info { + char *device_number; + dev_t dev; + char *mountpoint; + char *fstype; +}; + +/* Convert a string in the format n:m to a device number */ +static dev_t dev_from_arg(const char *device_number) +{ + char *s = strdup(device_number), *p; + char *maj_s, *min_s; + unsigned int maj, min; + dev_t dev; + + maj_s = p = s; + for ( ; *p != ':'; p++) + ; + + *p = '\0'; + min_s = p + 1; + + maj = strtol(maj_s, NULL, 10); + min = strtol(min_s, NULL, 10); + + dev = makedev(maj, min); + + free(s); + return dev; +} + +#define sfree(ptr) if (ptr) free(ptr) + +/* device_info maintenance */ +static void init_device_info(struct device_info *di, const char *device_number) +{ + di->device_number = strdup(device_number); + di->dev = dev_from_arg(device_number); + di->mountpoint = NULL; + di->fstype = NULL; +} + + +static void free_device_info(struct device_info *di) +{ + sfree(di->mountpoint); + sfree(di->fstype); + sfree(di->device_number); +} + +static int get_mountinfo(const char *device_number, struct device_info *device_info, const char *mountinfo_path) +{ + int ret = 0; + struct libmnt_table *mnttbl; + struct libmnt_fs *fs; + char *target; + + init_device_info(device_info, device_number); + + mnttbl = mnt_new_table(); + + if ((ret = mnt_table_parse_file(mnttbl, mountinfo_path)) < 0) + goto out_free_tbl; + + if ((fs = mnt_table_find_devno(mnttbl, device_info->dev, MNT_ITER_FORWARD)) == NULL) { + ret = ENOENT; + goto out_free_tbl; + } + + if ((target = (char *)mnt_fs_get_target(fs)) == NULL) { + ret = ENOENT; + goto out_free_fs; + } + + device_info->mountpoint = strdup(target); + target = (char *)mnt_fs_get_fstype(fs); + if (target) + device_info->fstype = strdup(target); + +out_free_fs: + mnt_free_fs(fs); +out_free_tbl: + mnt_free_table(mnttbl); + free(device_info->device_number); + device_info->device_number = NULL; + return ret; +} + +static int get_device_info(const char *device_number, struct device_info *device_info) +{ + int ret = ENOENT; + for (int retry_count = 0; retry_count < 10 && ret != 0; retry_count++) + ret = get_mountinfo(device_number, device_info, MOUNTINFO_PATH); + + return ret; +} int main(int argc, char **argv) { + int ret = 0; + struct device_info device; unsigned int readahead = 128; + + if (argc != 2) { + return -EINVAL; + } + + if ((ret = get_device_info(argv[1], &device)) != 0) { + goto out; + } + + if (strncmp("nfs", device.fstype, 3) != 0) { + ret = -EINVAL; + goto out; + } + printf("%d\n", readahead); + +out: + free_device_info(&device); + return ret; } |