Return-Path: Received: from mx2.netapp.com ([216.240.18.37]:47184 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755825Ab0KLItX (ORCPT ); Fri, 12 Nov 2010 03:49:23 -0500 Received: from localhost.localdomain (hess01-lxp.hq.netapp.com [10.58.60.52] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id oAC8n7fD025967 for ; Fri, 12 Nov 2010 00:49:09 -0800 (PST) From: Fred Isaman To: linux-nfs@vger.kernel.org Subject: [PATCH 03/22] pnfs-submit: layoutreturn's rpc_call_op functions need to handle bulk returns Date: Fri, 12 Nov 2010 03:48:25 -0500 Message-Id: <1289551724-18575-4-git-send-email-iisaman@netapp.com> In-Reply-To: <1289551724-18575-1-git-send-email-iisaman@netapp.com> References: <1289551724-18575-1-git-send-email-iisaman@netapp.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: Content-Type: text/plain MIME-Version: 1.0 nfs4_proc_layoutreturn and its descendants were assuming that inode and lo were always available, but that is not true in the case of a bulk return. Signed-off-by: Fred Isaman --- fs/nfs/callback_proc.c | 1 + fs/nfs/nfs4proc.c | 37 ++++++++++++++++++------------------- fs/nfs/pnfs.c | 4 +++- include/linux/nfs_xdr.h | 1 + 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index 6b560ce..4dabc62 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -270,6 +270,7 @@ static int pnfs_recall_layout(void *data) lrp->args.reclaim = 0; lrp->args.layout_type = rl.cbl_layout_type; lrp->args.return_type = rl.cbl_recall_type; + lrp->clp = clp; lrp->args.range = rl.cbl_seg; lrp->args.inode = inode; nfs4_proc_layoutreturn(lrp, true); diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d01068c..8dbd711 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5553,23 +5553,23 @@ static void nfs4_layoutreturn_prepare(struct rpc_task *task, void *calldata) { struct nfs4_layoutreturn *lrp = calldata; - struct inode *ino = lrp->args.inode; - struct nfs_inode *nfsi = NFS_I(ino); - struct nfs_server *server = NFS_SERVER(ino); dprintk("--> %s\n", __func__); - if ((lrp->args.return_type == RETURN_FILE) && - pnfs_return_layout_barrier(nfsi, &lrp->args.range)) { - dprintk("%s: waiting on barrier\n", __func__); - rpc_sleep_on(&nfsi->lo_rpcwaitq, task, NULL); - return; + if (lrp->args.return_type == RETURN_FILE) { + struct nfs_inode *nfsi = NFS_I(lrp->args.inode); + + if (pnfs_return_layout_barrier(nfsi, &lrp->args.range)) { + dprintk("%s: waiting on barrier\n", __func__); + rpc_sleep_on(&nfsi->lo_rpcwaitq, task, NULL); + return; + } } if (lrp->stateid) { /* Forget the layout, without sending the return */ rpc_exit(task, 0); return; } - if (nfs4_setup_sequence(server, NULL, &lrp->args.seq_args, + if (nfs41_setup_sequence(lrp->clp->cl_session, &lrp->args.seq_args, &lrp->res.seq_res, 0, task)) return; rpc_call_start(task); @@ -5578,16 +5578,19 @@ nfs4_layoutreturn_prepare(struct rpc_task *task, void *calldata) static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata) { struct nfs4_layoutreturn *lrp = calldata; - struct inode *ino = lrp->args.inode; - struct nfs_server *server = NFS_SERVER(ino); + struct nfs_server *server; dprintk("--> %s\n", __func__); if (!nfs4_sequence_done(task, &lrp->res.seq_res)) return; - if (nfs4_async_handle_error(task, server, NULL, NULL) == -EAGAIN) - nfs_restart_rpc(task, server->nfs_client); + if (lrp->args.return_type == RETURN_FILE) + server = NFS_SERVER(lrp->args.inode); + else + server = NULL; + if (nfs4_async_handle_error(task, server, NULL, lrp->clp) == -EAGAIN) + nfs_restart_rpc(task, lrp->clp); dprintk("<-- %s\n", __func__); } @@ -5595,10 +5598,8 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata) static void nfs4_layoutreturn_release(void *calldata) { struct nfs4_layoutreturn *lrp = calldata; - struct pnfs_layout_hdr *lo = NFS_I(lrp->args.inode)->layout; - dprintk("--> %s return_type %d lo %p\n", __func__, - lrp->args.return_type, lo); + dprintk("--> %s return_type %d\n", __func__, lrp->args.return_type); pnfs_layoutreturn_release(lrp); kfree(calldata); @@ -5613,8 +5614,6 @@ static const struct rpc_call_ops nfs4_layoutreturn_call_ops = { int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool issync) { - struct inode *ino = lrp->args.inode; - struct nfs_server *server = NFS_SERVER(ino); struct rpc_task *task; struct rpc_message msg = { .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_LAYOUTRETURN], @@ -5622,7 +5621,7 @@ int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool issync) .rpc_resp = &lrp->res, }; struct rpc_task_setup task_setup_data = { - .rpc_client = server->client, + .rpc_client = lrp->clp->cl_rpcclient, .rpc_message = &msg, .callback_ops = &nfs4_layoutreturn_call_ops, .callback_data = lrp, diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 72d7ed3..149f95e 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -582,11 +582,12 @@ pnfs_return_layout_barrier(struct nfs_inode *nfsi, void pnfs_layoutreturn_release(struct nfs4_layoutreturn *lrp) { - struct pnfs_layout_hdr *lo = NFS_I(lrp->args.inode)->layout; + struct pnfs_layout_hdr *lo; LIST_HEAD(tmp_list); if (lrp->args.return_type != RETURN_FILE) return; + lo = NFS_I(lrp->args.inode)->layout; spin_lock(&lrp->args.inode->i_lock); pnfs_clear_lseg_list(lo, &tmp_list, &lrp->args.range); if (!lrp->res.valid) @@ -625,6 +626,7 @@ return_layout(struct inode *ino, struct pnfs_layout_range *range, lrp->args.range = *range; lrp->args.inode = ino; lrp->stateid = stateid; + lrp->clp = server->nfs_client; status = nfs4_proc_layoutreturn(lrp, wait); out: diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 53a4d2f..23a4519 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -279,6 +279,7 @@ struct nfs4_layoutreturn { struct nfs4_layoutreturn_res res; struct rpc_cred *cred; const nfs4_stateid *stateid; + struct nfs_client *clp; int rpc_status; }; -- 1.7.2.1