From 46704243eb10718c722607cc7f66703e3eb3ac9c Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Fri, 4 Jan 2008 10:26:21 -0500 Subject: [PATCH] Get rid of the "-i" option for mount.nfs[4] and always use the text- based mount(2) system call for kernel version 2.6.23 and later. Signed-off-by: Chuck Lever Signed-off-by: Steve Dickson --- utils/mount/mount.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/utils/mount/mount.c b/utils/mount/mount.c index 21946f7..6ae6b79 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -64,7 +64,6 @@ static struct option longopts[] = { { "version", 0, 0, 'V' }, { "read-write", 0, 0, 'w' }, { "rw", 0, 0, 'w' }, - { "string", 0, 0, 'i' }, { "options", 1, 0, 'o' }, { NULL, 0, 0, 0 } }; @@ -176,6 +175,9 @@ static void discover_nfs_mount_data_version(void) } if (nfs_mount_data_version > NFS_MOUNT_VERSION) nfs_mount_data_version = NFS_MOUNT_VERSION; + else + if (kernel_version > MAKE_VERSION(2, 6, 22)) + string++; } static void print_one(char *spec, char *node, char *type, char *opts) @@ -285,7 +287,6 @@ void mount_usage(void) printf(_("\t-f\t\tFake mount, do not actually mount\n")); printf(_("\t-n\t\tDo not update /etc/mtab\n")); printf(_("\t-s\t\tTolerate sloppy mount options rather than fail\n")); - printf(_("\t-i\t\tPass mount options to the kernel via a string\n")); printf(_("\t-h\t\tPrint this help\n")); printf(_("\tnfsoptions\tRefer to mount.nfs(8) or nfs(5)\n\n")); } @@ -431,7 +432,7 @@ int main(int argc, char *argv[]) mount_point = argv[2]; argv[2] = argv[0]; /* so that getopt error messages are correct */ - while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hsi", + while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hs", longopts, NULL)) != -1) { switch (c) { case 'r': @@ -461,20 +462,6 @@ int main(int argc, char *argv[]) case 's': ++sloppy; break; - case 'i': - if (linux_version_code() < MAKE_VERSION(2, 6, 23)) { - nfs_error(_("%s: Passing mount options via a" - " string is unsupported by this" - " kernel\n"), progname); - goto out_usage; - } - if (uid != 0) { - nfs_error(_("%s: -i option is restricted to 'root'\n"), - progname); - goto out_usage; - } - ++string; - break; case 'h': default: mount_usage(); -- 2.39.5