[pnfs] [PATCH 2/4] Slot Table Implementation for pNFS

[iyer at netapp.com]

From: Rahul Iyer <iyer at netapp.com>

Changed _nfs4_proc_setup_sequence to _nfs41_proc_setup_sequence to that master
is a superset of the 4.1-sessions branch

Signed-off-by: Rahul Iyer <iyer at netapp.com>
---
 fs/nfs/nfs4proc.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 1296e4b..7756708 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -241,7 +241,7 @@ static int nfs41_proc_sequence_done(struct nfs4_session *session, struct nfs41_s
 	return status;
 }
 
-static int _nfs4_proc_setup_sequence(struct nfs4_session *session, struct nfs41_sequence_args *args, struct nfs41_sequence_res *res)
+static int _nfs41_proc_setup_sequence(struct nfs4_session *session, struct nfs41_sequence_args *args, struct nfs41_sequence_res *res)
 {
 	u32 *ptr;
 	ptr = (u32 *)session->sess_id;
@@ -272,7 +272,7 @@ static int nfs41_proc_setup_sequence_call(struct nfs4_session *session, struct n
 		BUG();
 	up(&session->session_sem);
 
-	status = _nfs4_proc_setup_sequence(session, args, res);
+	status = _nfs41_proc_setup_sequence(session, args, res);
 	if (status)
 		goto out;
 
@@ -2163,7 +2163,7 @@ static int _nfs4_proc_read(struct nfs_read_data *rdata, struct rpc_clnt *clnt, s
 	}
 	else {
 		/* This is to the DS */
-		if ((status = _nfs4_proc_setup_sequence(session,
+		if ((status = _nfs41_proc_setup_sequence(session,
 				rdata->args.minorversion_info,
 				rdata->res.minorversion_info)))
 			return status;
@@ -2481,7 +2481,7 @@ static int _pnfs4_proc_write(struct nfs_write_data *wdata, struct rpc_clnt *clnt
 	dprintk("pNFS call  write %d @ %Ld\n", wdata->args.count,
 			(long long) wdata->args.offset);
 
-	if(status = _nfs4_proc_setup_sequence(session,
+	if(status = _nfs41_proc_setup_sequence(session,
 				wdata->args.minorversion_info,
 				wdata->res.minorversion_info))
                 return status;
@@ -3468,7 +3468,7 @@ static void nfs4_proc_read_setup(struct nfs_read_data *data)
 	}
 	else {
 		/* DS */
-		_nfs4_proc_setup_sequence(session,
+		_nfs41_proc_setup_sequence(session,
 				data->args.minorversion_info,
 				data->res.minorversion_info);
 	}
@@ -3609,7 +3609,7 @@ static void pnfs4_proc_write_setup(struct nfs_write_data *data, int how)
 					data->res.minorversion_info);
 	}
 	else {
-		_nfs4_proc_setup_sequence(session,
+		_nfs41_proc_setup_sequence(session,
 				data->args.minorversion_info,
 				data->res.minorversion_info);
 	}
@@ -3749,7 +3749,7 @@ static void pnfs4_proc_commit_setup(struct nfs_write_data *data, int how)
 			data->res.minorversion_info);
 	}
 	else {
-		_nfs4_proc_setup_sequence(session,
+		_nfs41_proc_setup_sequence(session,
 				data->args.minorversion_info,
 				data->res.minorversion_info);
 	}
@@ -3868,7 +3868,7 @@ int nfs4_proc_async_sequence(struct nfs4_client *clp, struct rpc_cred *cred)
 
 	dprintk("sending sequence call!\n");
 
-        _nfs4_proc_setup_sequence(clp->cl_session, args, res);
+        _nfs41_proc_setup_sequence(clp->cl_session, args, res);
 
 	msg.rpc_proc    = &nfs4_procedures[NFSPROC4_CLNT_SEQUENCE];
 	msg.rpc_argp    = args;
@@ -3900,7 +3900,7 @@ int nfs4_proc_sequence(struct nfs4_client *clp, struct rpc_cred *cred)
 		.rpc_cred       = cred,
 	};
 
-        _nfs4_proc_setup_sequence(clp->cl_session, &args, &res);
+        _nfs41_proc_setup_sequence(clp->cl_session, &args, &res);
 
 	status = rpc_call_sync(clp->cl_rpcclient, &msg, 0);
 	nfs41_proc_sequence_done(clp->cl_session, &res, status);
@@ -4441,7 +4441,7 @@ int nfs4_proc_get_lease_time(struct nfs4_client *clp, struct nfs_fsinfo *fsinfo)
 	};
 	int status;
 
-	if ((status = _nfs4_proc_setup_sequence(clp->cl_session,
+	if ((status = _nfs41_proc_setup_sequence(clp->cl_session,
 				args.minorversion_info,
 				res.minorversion_info)))
 		return status;
-- 
1.5.0.2