Nobody's running 2.4 kernels anymore, right? Suggested-by: "Darrick J. Wong" Signed-off-by: Bernd Schubert --- util/fusermount.c | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/util/fusermount.c b/util/fusermount.c index 8d7598998788f72ea05c2a065a88cb5efd61df35..254f24a98abf935846cfed754693cc1958c8d2ff 100644 --- a/util/fusermount.c +++ b/util/fusermount.c @@ -915,33 +915,6 @@ static void free_mount_params(struct mount_params *mp) free(mp->mnt_opts); } -/* - * Check if option is deprecated large_read. - * - * Returns true if the option should be skipped (large_read on kernel > 2.4), - * false otherwise (all other options or large_read on old kernels). - */ -static bool check_large_read(const char *opt, unsigned int len) -{ - struct utsname utsname; - unsigned int kmaj, kmin; - int res; - - if (!opt_eq(opt, len, "large_read")) - return false; - - res = uname(&utsname); - if (res == 0 && - sscanf(utsname.release, "%u.%u", &kmaj, &kmin) == 2 && - (kmaj > 2 || (kmaj == 2 && kmin > 4))) { - fprintf(stderr, - "%s: note: 'large_read' mount option is deprecated for %i.%i kernels\n", - progname, kmaj, kmin); - return true; - } - return false; -} - /* * Check if user has permission to use allow_other or allow_root options. * @@ -1041,19 +1014,11 @@ static int prepare_mount(const char *opts, struct mount_params *mp) !begins_with(s, "rootmode=") && !begins_with(s, "user_id=") && !begins_with(s, "group_id=")) { - bool skip; if (check_allow_permission(s, len) == -1) goto err; - skip = check_large_read(s, len); - - /* - * Skip deprecated large_read to avoid passing it to - * kernel which would reject it as unknown option. - */ - if (!skip) - process_generic_option(s, len, &mp->flags, &d); + process_generic_option(s, len, &mp->flags, &d); } s += len; if (*s) -- 2.43.0