From: Benny Halevy <bhalevy@panasas.com>
To: Fred Isaman <iisaman@netapp.com>
Cc: linux-nfs@vger.kernel.org
Subject: Re: [PATCH 05/18] pnfs-submit: layoutreturn' rpc_call_op functions need to handle bulk returns
Date: Thu, 11 Nov 2010 17:01:34 +0200 [thread overview]
Message-ID: <4CDC054E.1030500@panasas.com> (raw)
In-Reply-To: <1288884151-11128-6-git-send-email-iisaman@netapp.com>
On 2010-11-04 17:22, Fred Isaman wrote:
> 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 <iisaman@netapp.com>
Looks good. Thanks!
> ---
> 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 3e022a8..53a85648 100644
> --- a/fs/nfs/callback_proc.c
> +++ b/fs/nfs/callback_proc.c
> @@ -284,6 +284,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 73bd44e..8d3965c 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -5557,23 +5557,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);
> @@ -5582,8 +5582,7 @@ 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__);
>
> @@ -5593,8 +5592,12 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata)
> if (RPC_ASSASSINATED(task))
> 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__);
> }
> @@ -5602,10 +5605,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);
> @@ -5620,8 +5621,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],
> @@ -5629,7 +5628,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 01ecb95..34f6914 100644
> --- a/fs/nfs/pnfs.c
> +++ b/fs/nfs/pnfs.c
> @@ -590,10 +590,11 @@ 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;
>
> if (lrp->args.return_type != RETURN_FILE)
> return;
> + lo = NFS_I(lrp->args.inode)->layout;
> spin_lock(&lrp->args.inode->i_lock);
> if (!lrp->res.valid)
> ; /* forgetful model internal release */
> @@ -630,6 +631,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 1ff6cb0..0ee7cce 100644
> --- a/include/linux/nfs_xdr.h
> +++ b/include/linux/nfs_xdr.h
> @@ -280,6 +280,7 @@ struct nfs4_layoutreturn {
> struct nfs4_layoutreturn_res res;
> struct rpc_cred *cred;
> const nfs4_stateid *stateid;
> + struct nfs_client *clp;
> int rpc_status;
> };
>
next prev parent reply other threads:[~2010-11-11 15:01 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-04 15:22 [PATCH 00/18] rewrite of CB_LAYOUTRECALL and layoutstate code Fred Isaman
2010-11-04 15:22 ` [PATCH 01/18] NFSv4.1: Callback share session between ops Fred Isaman
2010-11-10 13:37 ` Benny Halevy
2010-11-10 13:41 ` [PATCH] SQUASHME: pnfs-submit: fixups for nfsv4.1 callbacks Benny Halevy
2010-11-10 14:53 ` Fred Isaman
2010-11-04 15:22 ` [PATCH 02/18] pnfs-submit: change pnfs_layout_segment refcounting from kref to atomic_t Fred Isaman
2010-11-04 15:22 ` [PATCH 03/18] pnfs-submit: remove _pnfs_can_return_lseg call from pnfs_clear_lseg_list Fred Isaman
2010-11-10 14:35 ` Benny Halevy
2010-11-10 14:46 ` Fred Isaman
2010-11-11 7:00 ` Benny Halevy
2010-11-11 13:52 ` Fred Isaman
2010-11-11 14:39 ` Benny Halevy
2010-11-04 15:22 ` [PATCH 04/18] pnfs-submit: change layout state seqlock to a spinlock Fred Isaman
2010-11-11 15:00 ` Benny Halevy
2010-11-11 15:09 ` Fred Isaman
2010-11-04 15:22 ` [PATCH 05/18] pnfs-submit: layoutreturn' rpc_call_op functions need to handle bulk returns Fred Isaman
2010-11-11 15:01 ` Benny Halevy [this message]
2010-11-04 15:22 ` [PATCH 06/18] pnfs_submit: nfs4_layoutreturn_release should not reference results Fred Isaman
2010-11-11 15:16 ` Benny Halevy
2010-11-04 15:22 ` [PATCH 07/18] pnfs-submit: reorganize struct cb_layoutrecallargs Fred Isaman
2010-11-04 15:22 ` [PATCH 08/18] pnfs-submit: rename lo->state to lo->plh_flags Fred Isaman
2010-11-04 15:22 ` [PATCH 09/18] pnfs-submit: change pnfs_layout_hdr refcount to atomic_t Fred Isaman
2010-11-04 15:22 ` [PATCH 10/18] pnfs-submit: argument to should_free_lseg changed from lseg to range Fred Isaman
2010-11-04 15:22 ` [PATCH 11/18] pnfs-submit: remove unnecessary field lgp->status Fred Isaman
2010-11-04 15:22 ` [PATCH 12/18] pnfs-submit: remove RPC_ASSASSINATED(task) checks Fred Isaman
2010-11-04 15:22 ` [PATCH 13/18] pnfs-submit: rewrite of layout state handling and cb_layoutrecall Fred Isaman
2010-11-04 15:22 ` [PATCH 14/18] pnfs-submit: increase number of outstanding CB_LAYOUTRECALLS we can handle Fred Isaman
2010-11-04 15:22 ` [PATCH 15/18] pnfs-submit: roc add layoutreturn op to close compound Fred Isaman
2010-11-04 15:22 ` [PATCH 16/18] pnfs-submit refactor layoutcommit xdr structures Fred Isaman
2010-11-04 15:22 ` [PATCH 17/18] pnfs-submit refactor pnfs_layoutcommit_setup Fred Isaman
2010-11-04 15:22 ` [PATCH 18/18] pnfs_submit: roc add layoutcommit op to close compound Fred Isaman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CDC054E.1030500@panasas.com \
--to=bhalevy@panasas.com \
--cc=iisaman@netapp.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.