From: Chuck Lever Date: Fri, 26 Oct 2007 17:32:19 +0000 (-0400) Subject: NFS: Ensure that NFS version 4 mounts use NFS_PORT if nfsport wasn't set X-Git-Tag: v2.6.25-rc1~1146^2~72 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0eb2574121ef0ffbebe5335c66c227d1b987fa25;p=linux-2.6-omap-h63xx.git NFS: Ensure that NFS version 4 mounts use NFS_PORT if nfsport wasn't set Text-based mount option parsing introduced a minor regression in the behavior of NFS version 4 mounts. NFS version 4 is not supposed to require a running rpcbind service on the server in order for a mount to succeed. In other words, if the mount options don't specify a port number, the port number is supposed to default to 2049. For earlier versions of NFS, the default port number was zero in order to cause the RPC client to autobind to the server's NFS service. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust --- diff --git a/fs/nfs/super.c b/fs/nfs/super.c index fda1635dd13..7d84d94fa82 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1643,6 +1643,8 @@ static int nfs4_validate_mount_data(void *options, if (nfs_parse_mount_options((char *)options, args) == 0) return -EINVAL; + if (args->nfs_server.address.sin_port == 0) + args->nfs_server.address.sin_port = htons(NFS_PORT); if (!nfs_verify_server_address((struct sockaddr *) &args->nfs_server.address)) return -EINVAL;