From 63619d0ee991bd7bcf3e09c7f0dbff283b57be06 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 15 Apr 2013 17:12:26 +0800 Subject: nfs-utils: support mountprog and nfsprog options Add back the support for mountprog and nfsprog options since they are supported by our kernel NFS client. Upstream-status: Inappropriate Signed-off-by: Jackie Huang --- utils/mount/stropts.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 4b59974..ca082b6 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -445,9 +445,6 @@ static int nfs_construct_new_options(struct mount_options *options, char new_option[64]; char *netid; - po_remove_all(options, "nfsprog"); - po_remove_all(options, "mountprog"); - po_remove_all(options, "v2"); po_remove_all(options, "v3"); po_remove_all(options, "vers"); @@ -557,13 +554,6 @@ nfs_rewrite_pmap_mount_options(struct mount_options *options, int checkv4) return 0; } - /* - * The kernel NFS client doesn't support changing the RPC - * program number for these services, so force the value of - * these fields before probing the server's ports. - */ - nfs_pmap.pm_prog = NFS_PROGRAM; - mnt_pmap.pm_prog = MOUNTPROG; /* * If the server's rpcbind service isn't available, we can't -- 2.7.4