Linux NFS development
 help / color / mirror / Atom feed
From: Fred Isaman <iisaman@netapp.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 6/7] SQUASHME: pnfs_submit: Only use asynch error handler for LAYOUTCOMMIT
Date: Fri,  1 Oct 2010 12:02:50 -0400	[thread overview]
Message-ID: <1285948971-2048-7-git-send-email-iisaman@netapp.com> (raw)
In-Reply-To: <1285948971-2048-1-git-send-email-iisaman@netapp.com>

Signed-off-by: Fred Isaman <iisaman@netapp.com>
---
 fs/nfs/nfs4proc.c |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index e28da81..0ac77a6 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5561,8 +5561,8 @@ static const struct rpc_call_ops nfs4_layoutcommit_ops = {
 };
 
 /* Execute a layoutcommit to the server */
-static int
-_nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, int issync)
+int
+nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, int issync)
 {
 	struct rpc_message msg = {
 		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_LAYOUTCOMMIT],
@@ -5605,20 +5605,6 @@ out:
 	return 0;
 }
 
-int nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, int issync)
-{
-	struct nfs4_exception exception = { };
-	struct nfs_server *server = NFS_SERVER(data->args.inode);
-	int err;
-
-	do {
-		err = nfs4_handle_exception(server,
-					_nfs4_proc_layoutcommit(data, issync),
-					&exception);
-	} while (exception.retry);
-	return err;
-}
-
 static void
 nfs4_layoutreturn_prepare(struct rpc_task *task, void *calldata)
 {
-- 
1.7.2.1


  parent reply	other threads:[~2010-10-01 16:03 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-01 16:02 [PATCH 0/7] misc fixes and cleanup Fred Isaman
2010-10-01 16:02 ` [PATCH 1/7] SQUASHME: pnfs-devinfo-submit: misc small fixes Fred Isaman
2010-10-01 16:02 ` [PATCH 2/7] SQUASHME: pnfs_submit: remove inlines from *.c files Fred Isaman
2010-10-01 16:02 ` [PATCH 3/7] SQUASHME: pnfs-devinfo-submit: fix comments in pnfs_layout*_release Fred Isaman
2010-10-01 16:02 ` [PATCH 4/7] nfs: change end of line commas to semicolons Fred Isaman
2010-10-01 16:02 ` [PATCH 5/7] SQUASHME: pnfs-devinfo-submit: Use only asynch error handler for LAYOUTGET Fred Isaman
2010-10-01 16:02 ` Fred Isaman [this message]
2010-10-01 16:02 ` [PATCH 7/7] SQUASHME: pnfs_submit: only use asynch error handler for LAYOUTRETURN Fred Isaman
2010-10-01 16:30 ` [PATCH 0/7] misc fixes and cleanup Benny Halevy
2010-10-01 17:00   ` Benny Halevy

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=1285948971-2048-7-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox