From 87ea601cb76dec0404f3ef1535d453e8a463d006 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Tue, 3 Aug 2010 13:04:00 -0400 Subject: [PATCH] --- yaml --- r: 206417 b: refs/heads/master c: d5eff1a3412f6d75bf28f423c5015ece8055407a h: refs/heads/master i: 206415: 77586e7c894ef1e063462edb4aed8449f1b29d7a v: v3 --- [refs] | 2 +- trunk/fs/nfs/super.c | 4 ++++ trunk/include/linux/nfs_mount.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1f3c8db51304..64145517bf88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 761fe93cdfa29071879d882c92e966ae692c0048 +refs/heads/master: d5eff1a3412f6d75bf28f423c5015ece8055407a diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c index f9df16de4a56..f1ae39f6cb02 100644 --- a/trunk/fs/nfs/super.c +++ b/trunk/fs/nfs/super.c @@ -546,6 +546,9 @@ static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss, { struct sockaddr *sap = (struct sockaddr *)&nfss->mountd_address; + if (nfss->flags & NFS_MOUNT_LEGACY_INTERFACE) + return; + switch (sap->sa_family) { case AF_INET: { struct sockaddr_in *sin = (struct sockaddr_in *)sap; @@ -1780,6 +1783,7 @@ static int nfs_validate_mount_data(void *options, * can deal with. */ args->flags = data->flags & NFS_MOUNT_FLAGMASK; + args->flags |= NFS_MOUNT_LEGACY_INTERFACE; args->rsize = data->rsize; args->wsize = data->wsize; args->timeo = data->timeo; diff --git a/trunk/include/linux/nfs_mount.h b/trunk/include/linux/nfs_mount.h index 4499016e6d0d..5d59ae861aa6 100644 --- a/trunk/include/linux/nfs_mount.h +++ b/trunk/include/linux/nfs_mount.h @@ -69,5 +69,6 @@ struct nfs_mount_data { #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 #define NFS_MOUNT_LOOKUP_CACHE_NONE 0x20000 #define NFS_MOUNT_NORESVPORT 0x40000 +#define NFS_MOUNT_LEGACY_INTERFACE 0x80000 #endif