--- ./fs/nfs/nfs3proc.c.orig	2005-06-12 23:38:43.000000000 +0200
+++ ./fs/nfs/nfs3proc.c	2005-06-12 23:45:37.000000000 +0200
@@ -50,7 +50,7 @@
 }
 
 static int
-new_nfs3_rpc(struct rpc_clnt *clnt, u32 proc, void *argp, void *resp,
+nfs3_rpc(struct rpc_clnt *clnt, u32 proc, void *argp, void *resp,
 	 struct rpc_groups *fsg)
 {
 	struct rpc_cred	*cred;
@@ -62,7 +62,6 @@
 	put_rpccred(cred);
 	return res;
 }
-#define nfs3_rpc(clnt,proc,argp,resp,...) new_nfs3_rpc(clnt,proc,argp,resp,NULL)
 
 static int
 nfs3_async_handle_jukebox(struct rpc_task *task)
@@ -86,10 +85,11 @@
 
 	dprintk("%s: call  fsinfo\n", __FUNCTION__);
 	info->fattr->valid = 0;
-	status = nfs3_rpc(server->client_sys, NFS3PROC_FSINFO, fhandle, info);
+	status = nfs3_rpc(server->client_sys, NFS3PROC_FSINFO, fhandle, info, NULL);
 	dprintk("%s: reply fsinfo: %d\n", __FUNCTION__, status);
 	if (!(info->fattr->valid & NFS_ATTR_FATTR)) {
-		status = nfs3_rpc(server->client_sys, NFS3PROC_GETATTR, fhandle, info->fattr);
+		status = nfs3_rpc(server->client_sys, NFS3PROC_GETATTR, fhandle,
+				  info->fattr, NULL);
 		dprintk("%s: reply getattr: %d\n", __FUNCTION__, status);
 	}
 	return status;
@@ -106,7 +106,7 @@
 
 	dprintk("NFS call  getattr\n");
 	fattr->valid = 0;
-	status = nfs3_rpc(server->client, NFS3PROC_GETATTR, fhandle, fattr);
+	status = nfs3_rpc(server->client, NFS3PROC_GETATTR, fhandle, fattr, NULL);
 	dprintk("NFS reply getattr: %d\n", status);
 	return status;
 }
@@ -153,7 +153,7 @@
 	status = nfs3_rpc(NFS_CLIENT(dir), NFS3PROC_LOOKUP, &arg, &res, fsg);
 	if (status >= 0 && !(fattr->valid & NFS_ATTR_FATTR))
 		status = nfs3_rpc(NFS_CLIENT(dir), NFS3PROC_GETATTR,
-				  fhandle, fattr);
+				  fhandle, fattr, NULL);
 	dprintk("NFS reply lookup: %d\n", status);
 	if (status >= 0)
 		status = nfs_refresh_inode(dir, &dir_attr);
@@ -218,7 +218,7 @@
 
 	dprintk("NFS call  readlink\n");
 	fattr.valid = 0;
-	status = nfs3_rpc(NFS_CLIENT(inode), NFS3PROC_READLINK, &args, &fattr);
+	status = nfs3_rpc(NFS_CLIENT(inode), NFS3PROC_READLINK, &args, &fattr, NULL);
 	nfs_refresh_inode(inode, &fattr);
 	dprintk("NFS reply readlink: %d\n", status);
 	return status;
@@ -650,7 +650,7 @@
 
 	dprintk("NFS call  fsstat\n");
 	stat->fattr->valid = 0;
-	status = nfs3_rpc(server->client, NFS3PROC_FSSTAT, fhandle, stat);
+	status = nfs3_rpc(server->client, NFS3PROC_FSSTAT, fhandle, stat, NULL);
 	dprintk("NFS reply statfs: %d\n", status);
 	return status;
 }
@@ -663,7 +663,7 @@
 
 	dprintk("NFS call  fsinfo\n");
 	info->fattr->valid = 0;
-	status = nfs3_rpc(server->client_sys, NFS3PROC_FSINFO, fhandle, info);
+	status = nfs3_rpc(server->client_sys, NFS3PROC_FSINFO, fhandle, info, NULL);
 	dprintk("NFS reply fsinfo: %d\n", status);
 	return status;
 }
@@ -676,7 +676,7 @@
 
 	dprintk("NFS call  pathconf\n");
 	info->fattr->valid = 0;
-	status = nfs3_rpc(server->client, NFS3PROC_PATHCONF, fhandle, info);
+	status = nfs3_rpc(server->client, NFS3PROC_PATHCONF, fhandle, info, NULL);
 	dprintk("NFS reply pathconf: %d\n", status);
 	return status;
 }
--- ./fs/nfs/proc.c.orig	2005-06-12 23:34:42.000000000 +0200
+++ ./fs/nfs/proc.c	2005-06-12 23:45:37.000000000 +0200
@@ -63,7 +63,7 @@
 }
 
 static int
-new_nfs2_rpc(struct rpc_clnt *clnt, u32 proc, void *argp, void *resp,
+nfs2_rpc(struct rpc_clnt *clnt, u32 proc, void *argp, void *resp,
 	 struct rpc_groups *fsg)
 {
 	struct rpc_cred	*cred;
@@ -75,7 +75,6 @@
 	put_rpccred(cred);
 	return res;
 }
-#define nfs2_rpc(clnt,proc,argp,resp,...) new_nfs2_rpc(clnt,proc,argp,resp,NULL)
 
 /*
  * Bare-bones access to getattr: this is for nfs_read_super.
@@ -90,12 +89,12 @@
 
 	dprintk("%s: call getattr\n", __FUNCTION__);
 	fattr->valid = 0;
-	status = nfs2_rpc(server->client_sys, NFSPROC_GETATTR, fhandle, fattr);
+	status = nfs2_rpc(server->client_sys, NFSPROC_GETATTR, fhandle, fattr, NULL);
 	dprintk("%s: reply getattr: %d\n", __FUNCTION__, status);
 	if (status)
 		return status;
 	dprintk("%s: call statfs\n", __FUNCTION__);
-	status = nfs2_rpc(server->client_sys, NFSPROC_STATFS, fhandle, &fsinfo);
+	status = nfs2_rpc(server->client_sys, NFSPROC_STATFS, fhandle, &fsinfo, NULL);
 	dprintk("%s: reply statfs: %d\n", __FUNCTION__, status);
 	if (status)
 		return status;
@@ -122,7 +121,7 @@
 
 	dprintk("NFS call  getattr\n");
 	fattr->valid = 0;
-	status = nfs2_rpc(server->client, NFSPROC_GETATTR, fhandle, fattr);
+	status = nfs2_rpc(server->client, NFSPROC_GETATTR, fhandle, fattr, NULL);
 	dprintk("NFS reply getattr: %d\n", status);
 	return status;
 }
@@ -180,7 +179,7 @@
 	int			status;
 
 	dprintk("NFS call  readlink\n");
-	status = nfs2_rpc(NFS_CLIENT(inode), NFSPROC_READLINK, &args, NULL);
+	status = nfs2_rpc(NFS_CLIENT(inode), NFSPROC_READLINK, &args, NULL, NULL);
 	dprintk("NFS reply readlink: %d\n", status);
 	return status;
 }
@@ -492,7 +491,7 @@
 
 	dprintk("NFS call  statfs\n");
 	stat->fattr->valid = 0;
-	status = nfs2_rpc(server->client, NFSPROC_STATFS, fhandle, &fsinfo);
+	status = nfs2_rpc(server->client, NFSPROC_STATFS, fhandle, &fsinfo, NULL);
 	dprintk("NFS reply statfs: %d\n", status);
 	if (status)
 		goto out;
@@ -515,7 +514,7 @@
 
 	dprintk("NFS call  fsinfo\n");
 	info->fattr->valid = 0;
-	status = nfs2_rpc(server->client, NFSPROC_STATFS, fhandle, &fsinfo);
+	status = nfs2_rpc(server->client, NFSPROC_STATFS, fhandle, &fsinfo, NULL);
 	dprintk("NFS reply fsinfo: %d\n", status);
 	if (status)
 		goto out;