From 29db2af7233eeea92b249eb5b41682a5ea507b3b Mon Sep 17 00:00:00 2001
From: Andy Adamson <andros@netapp.com>
Date: Thu, 6 Jan 2011 02:04:33 +0000
Subject: [PATCH] --- yaml --- r: 229221 b: refs/heads/master c:
 ece0de633c4d9106c39ea9f0db1638c42ead2541 h: refs/heads/master i:   229219:
 841768fde9a63fece51e74a4186d7c5712a9acbe v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfs/callback.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9a36d0a27bf2..dc686d0f0fdf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c36fca52f5e4594ffd0ff175b328966b0d393184
+refs/heads/master: ece0de633c4d9106c39ea9f0db1638c42ead2541
diff --git a/trunk/fs/nfs/callback.c b/trunk/fs/nfs/callback.c
index 15677e7bede5..753a9e315518 100644
--- a/trunk/fs/nfs/callback.c
+++ b/trunk/fs/nfs/callback.c
@@ -365,6 +365,9 @@ static int check_gss_callback_principal(struct nfs_client *clp,
 	struct rpc_clnt *r = clp->cl_rpcclient;
 	char *p = svc_gss_principal(rqstp);
 
+	/* No RPC_AUTH_GSS on NFSv4.1 back channel yet */
+	if (clp->cl_minorversion != 0)
+		return SVC_DROP;
 	/*
 	 * It might just be a normal user principal, in which case
 	 * userspace won't bother to tell us the name at all.