From 33d5a79ab4ba38ed526b1f53a0f80668400f2b8c Mon Sep 17 00:00:00 2001
From: Alexandros Batsakis <batsakis@netapp.com>
Date: Sat, 5 Dec 2009 13:19:01 -0500
Subject: [PATCH] --- yaml --- r: 175966 b: refs/heads/master c:
 07bccc2dd4e8745859f0fa7d120ea39320fbcdbf h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/fs/nfs/callback.c     | 1 +
 trunk/fs/nfs/callback_xdr.c | 7 +++++++
 trunk/fs/nfs/internal.h     | 1 +
 trunk/fs/nfs/nfs4_fs.h      | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cfa8409b11ff..1a7cc9e416bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b9e2d41f1f0360be08809d4e3bb56b67be6241a
+refs/heads/master: 07bccc2dd4e8745859f0fa7d120ea39320fbcdbf
diff --git a/trunk/fs/nfs/callback.c b/trunk/fs/nfs/callback.c
index e66ec5d169f7..73ab220354df 100644
--- a/trunk/fs/nfs/callback.c
+++ b/trunk/fs/nfs/callback.c
@@ -385,6 +385,7 @@ static int nfs_callback_authenticate(struct svc_rqst *rqstp)
  */
 static struct svc_version *nfs4_callback_version[] = {
 	[1] = &nfs4_callback_version1,
+	[4] = &nfs4_callback_version4,
 };
 
 static struct svc_stat nfs4_callback_stats;
diff --git a/trunk/fs/nfs/callback_xdr.c b/trunk/fs/nfs/callback_xdr.c
index 76b0aa0f73bf..0fda5e66241d 100644
--- a/trunk/fs/nfs/callback_xdr.c
+++ b/trunk/fs/nfs/callback_xdr.c
@@ -718,3 +718,10 @@ struct svc_version nfs4_callback_version1 = {
 	.vs_dispatch = NULL,
 };
 
+struct svc_version nfs4_callback_version4 = {
+	.vs_vers = 4,
+	.vs_nproc = ARRAY_SIZE(nfs4_callback_procedures1),
+	.vs_proc = nfs4_callback_procedures1,
+	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,
+	.vs_dispatch = NULL,
+};
diff --git a/trunk/fs/nfs/internal.h b/trunk/fs/nfs/internal.h
index a6f7b6cbfd09..7b890ba37fa2 100644
--- a/trunk/fs/nfs/internal.h
+++ b/trunk/fs/nfs/internal.h
@@ -156,6 +156,7 @@ struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentr
 
 /* callback_xdr.c */
 extern struct svc_version nfs4_callback_version1;
+extern struct svc_version nfs4_callback_version4;
 
 /* pagelist.c */
 extern int __init nfs_init_nfspagecache(void);
diff --git a/trunk/fs/nfs/nfs4_fs.h b/trunk/fs/nfs/nfs4_fs.h
index 5c7740178a08..0d25a82451d9 100644
--- a/trunk/fs/nfs/nfs4_fs.h
+++ b/trunk/fs/nfs/nfs4_fs.h
@@ -290,6 +290,7 @@ struct nfs4_mount_data;
 
 /* callback_xdr.c */
 extern struct svc_version nfs4_callback_version1;
+extern struct svc_version nfs4_callback_version4;
 
 #else