Re: [PATCH 0/6] AVR32 update for 2.6.18-rc2-mm1

[Trond Myklebust <trond.myklebust@fys.uio.no>]

On Wed, 2006-08-02 at 09:45 +0200, Haavard Skinnemoen wrote:
> On Tue, 01 Aug 2006 09:47:27 -0700
> Trond Myklebust <trond.myklebust@fys.uio.no> wrote:
> 
> > That 'sec=null' would explain why you are seeing a problem, and the
> > attached patch ought to fix it.
> 
> That does explain it, but unfortunately the patch doesn't fix it
> because data->version is 6. I added "case 6:" on the line after "case
> 5:", and it solved the problem.
> 
> I don't know what the difference between version 5 and 6 is, but I
> suspect it has something to do with data->context?

Argh... You are quite right. We ought to have fixed the pseudoflavour
thingy in version 6, and made it mandatory, but we missed the chance...

Revised patch is attached.

Cheers,
  Trond

--- Begin Message ---

• Subject: No Subject
• From: Trond Myklebust <Trond.Myklebust@netapp.com>
• Date: Thu, 03 Aug 2006 10:33:52 -0400
• Nfs: Ensure NFSv2/v3 mounts respect the NFS_MOUNT_SECFLAVOUR flag

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

 fs/nfs/super.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 867b5dc..97cfb14 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -471,12 +471,14 @@ static int nfs_validate_mount_data(struc
 						data->version);
 				return -EINVAL;
 			}
-			/* Fill in pseudoflavor for mount version < 5 */
-			data->pseudoflavor = RPC_AUTH_UNIX;
 		case 5:
 			memset(data->context, 0, sizeof(data->context));
 	}
 
+	/* Set the pseudoflavor */
+	if (!(data->flags & NFS_MOUNT_SECFLAVOUR))
+		data->pseudoflavor = RPC_AUTH_UNIX;
+
 #ifndef CONFIG_NFS_V3
 	/* If NFSv3 is not compiled in, return -EPROTONOSUPPORT */
 	if (data->flags & NFS_MOUNT_VER3) {

--- End Message ---