public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Benjamin Coddington <bcodding@redhat.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH] NFS: Handle exceptions for SEEK
Date: Sun, 14 Jun 2015 17:35:05 -0400	[thread overview]
Message-ID: <e666c4a3bb9da72bffbf5ecb33daba4a25d78a5a.1434317690.git.bcodding@redhat.com> (raw)

Don't pass along NFS4ERR_* exceptions to VFS and do recovery if needed.
These exceptions might look like offsets (even though they are negative) and
applications that used the previous behavior of seeking to eof for
SEEK_HOLE, and current offset for SEEK_DATA may be caught off-guard if the server
responds with transient errors such as NFS4ERR_GRACE.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
---
 fs/nfs/nfs42proc.c |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index 3a9e752..9c3c9d2 100644
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -146,20 +146,27 @@ loff_t nfs42_proc_llseek(struct file *filep, loff_t offset, int whence)
 		.rpc_resp = &res,
 	};
 	struct nfs_server *server = NFS_SERVER(inode);
+	struct nfs4_exception exception = { };
 	int status;
 
 	if (!nfs_server_capable(inode, NFS_CAP_SEEK))
 		return -ENOTSUPP;
 
-	status = nfs42_set_rw_stateid(&args.sa_stateid, filep, FMODE_READ);
-	if (status)
-		return status;
-
 	nfs_wb_all(inode);
-	status = nfs4_call_sync(server->client, server, &msg,
-				&args.seq_args, &res.seq_res, 0);
-	if (status == -ENOTSUPP)
-		server->caps &= ~NFS_CAP_SEEK;
+	do {
+		status = nfs42_set_rw_stateid(&args.sa_stateid, filep, FMODE_READ);
+		if (status)
+			return status;
+
+		status = nfs4_call_sync(server->client, server, &msg,
+					&args.seq_args, &res.seq_res, 0);
+		if (status == -ENOTSUPP) {
+			server->caps &= ~NFS_CAP_SEEK;
+			return status;
+		}
+		status = nfs4_handle_exception(server, status, &exception);
+	} while (exception.retry);
+
 	if (status)
 		return status;
 
-- 
1.7.1


             reply	other threads:[~2015-06-14 21:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-14 21:35 Benjamin Coddington [this message]
2015-06-15 17:26 ` [PATCH] NFS: Handle exceptions for SEEK J. Bruce Fields
2015-06-16 12:34 ` Anna Schumaker
2015-06-16 12:49   ` Benjamin Coddington
2015-07-22  8:19 ` Benjamin Coddington

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=e666c4a3bb9da72bffbf5ecb33daba4a25d78a5a.1434317690.git.bcodding@redhat.com \
    --to=bcodding@redhat.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