From: Fred Isaman <iisaman@netapp.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 02/11] wave 2: remove gratuitous changes to nfs4_layoutget_done
Date: Wed, 15 Dec 2010 11:03:02 -0500 [thread overview]
Message-ID: <1292428991-30788-2-git-send-email-iisaman@netapp.com> (raw)
In-Reply-To: <1292428991-30788-1-git-send-email-iisaman@netapp.com>
Signed-off-by: Fred Isaman <iisaman@netapp.com>
---
fs/nfs/nfs4proc.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index d8f754e..096c89d 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5405,12 +5405,13 @@ nfs4_layoutget_prepare(struct rpc_task *task, void *calldata)
static void nfs4_layoutget_done(struct rpc_task *task, void *calldata)
{
struct nfs4_layoutget *lgp = calldata;
- struct inode *ino = lgp->args.inode;
+ struct nfs_server *server = NFS_SERVER(lgp->args.inode);
dprintk("--> %s\n", __func__);
if (!nfs4_sequence_done(task, &lgp->res.seq_res))
return;
+
switch (task->tk_status) {
case 0:
break;
@@ -5419,8 +5420,7 @@ static void nfs4_layoutget_done(struct rpc_task *task, void *calldata)
task->tk_status = -NFS4ERR_DELAY;
/* Fall through */
default:
- if (nfs4_async_handle_error(task, NFS_SERVER(ino),
- NULL, NULL) == -EAGAIN) {
+ if (nfs4_async_handle_error(task, server, NULL, NULL) == -EAGAIN) {
rpc_restart_call_prepare(task);
return;
}
--
1.7.2.1
next prev parent reply other threads:[~2010-12-15 16:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-15 16:03 [PATCH 01/11] wave 2: restore removed comment in nfs4_evict_inode Fred Isaman
2010-12-15 16:03 ` Fred Isaman [this message]
2010-12-15 16:03 ` [PATCH 03/11] wave 2: remove pnfs_ld_layoutret_on_setattr() Fred Isaman
2010-12-15 16:03 ` [PATCH 04/11] wave 2: share code between put_lseg and pnfs_free_lseg_list Fred Isaman
2010-12-15 16:03 ` [PATCH 05/11] wave 2: remove notify_drained Fred Isaman
2010-12-15 16:03 ` [PATCH 06/11] wave 2: rename notify fields Fred Isaman
2010-12-15 16:03 ` [PATCH 07/11] wave 2: remove trigger_flush Fred Isaman
2010-12-15 16:03 ` [PATCH 08/11] wave 2: remove table above should_free_lseg Fred Isaman
2010-12-15 16:03 ` [PATCH 09/11] wave 2: Fix outdated comment above _pnfs_return_layout Fred Isaman
2010-12-15 16:03 ` [PATCH 10/11] wave 2: remove unneeded include from pnfs.h Fred Isaman
2010-12-15 16:03 ` [PATCH 11/11] wave 2: remove unneeded includes from callback_proc.c 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=1292428991-30788-2-git-send-email-iisaman@netapp.com \
--to=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.