From: Olga Kornievskaia <olga.kornievskaia@gmail.com>
To: trond.myklebust@hammerspace.com, anna.schumaker@netapp.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH v10 08/12] NFS: also send OFFLOAD_CANCEL to source server
Date: Mon, 8 Jul 2019 15:24:40 -0400 [thread overview]
Message-ID: <20190708192444.12664-9-olga.kornievskaia@gmail.com> (raw)
In-Reply-To: <20190708192444.12664-1-olga.kornievskaia@gmail.com>
From: Olga Kornievskaia <kolga@netapp.com>
In case of copy is cancelled, also send OFFLOAD_CANCEL to the source
server.
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
---
fs/nfs/nfs42proc.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index 50538b975aba..5d833f5748e9 100644
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -206,12 +206,14 @@ static int handle_async_copy(struct nfs42_copy_res *res,
memcpy(&res->write_res.verifier, ©->verf, sizeof(copy->verf));
status = -copy->error;
+out_free:
kfree(copy);
return status;
out_cancel:
nfs42_do_offload_cancel_async(dst, ©->stateid);
- kfree(copy);
- return status;
+ if (!nfs42_files_from_same_server(src, dst))
+ nfs42_do_offload_cancel_async(src, src_stateid);
+ goto out_free;
}
static int process_copy_commit(struct file *dst, loff_t pos_dst,
@@ -381,7 +383,8 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
if (err >= 0)
break;
- if (err == -ENOTSUPP) {
+ if (err == -ENOTSUPP &&
+ nfs42_files_from_same_server(src, dst)) {
err = -EOPNOTSUPP;
break;
} else if (err == -EAGAIN) {
@@ -392,7 +395,8 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
dst_exception.retry = 1;
continue;
} else if ((err == -ESTALE ||
- err == -NFS4ERR_OFFLOAD_DENIED) &&
+ err == -NFS4ERR_OFFLOAD_DENIED ||
+ err == -ENOTSUPP) &&
!nfs42_files_from_same_server(src, dst)) {
nfs42_do_offload_cancel_async(src, &args.src_stateid);
err = -EOPNOTSUPP;
--
2.18.1
next prev parent reply other threads:[~2019-07-08 19:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-08 19:24 [PATCH v10 00/12] client-side support for "inter" SSC copy Olga Kornievskaia
2019-07-08 19:24 ` [PATCH v10 01/12] NFS NFSD: defining nl4_servers structure needed by both Olga Kornievskaia
2019-07-08 19:24 ` [PATCH v10 02/12] NFS: add COPY_NOTIFY operation Olga Kornievskaia
2019-07-08 19:24 ` [PATCH v10 03/12] NFS: add ca_source_server<> to COPY Olga Kornievskaia
2019-07-08 19:24 ` [PATCH v10 04/12] NFS: inter ssc open Olga Kornievskaia
2019-07-09 14:01 ` Schumaker, Anna
2019-07-09 16:01 ` Olga Kornievskaia
2019-07-08 19:24 ` [PATCH v10 05/12] NFS: skip recovery of copy open on dest server Olga Kornievskaia
2019-07-08 19:24 ` [PATCH v10 06/12] NFS: for "inter" copy treat ESTALE as ENOTSUPP Olga Kornievskaia
2019-07-08 19:24 ` [PATCH v10 07/12] NFS: COPY handle ERR_OFFLOAD_DENIED Olga Kornievskaia
2019-07-08 19:24 ` Olga Kornievskaia [this message]
2019-07-08 19:24 ` [PATCH v10 09/12] NFS handle NFS4ERR_PARTNER_NO_AUTH error Olga Kornievskaia
2019-07-08 19:24 ` [PATCH v10 10/12] NFS: handle source server reboot Olga Kornievskaia
2019-07-08 19:24 ` [PATCH v10 11/12] NFS based on file size issue sync copy or fallback to generic copy offload Olga Kornievskaia
2019-07-08 19:24 ` [PATCH v10 12/12] NFS: replace cross device check in copy_file_range Olga Kornievskaia
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=20190708192444.12664-9-olga.kornievskaia@gmail.com \
--to=olga.kornievskaia@gmail.com \
--cc=anna.schumaker@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
/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;
as well as URLs for NNTP newsgroup(s).