Return-Path: Received: from mx141.netapp.com ([216.240.21.12]:54179 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751945AbdI1R2q (ORCPT ); Thu, 28 Sep 2017 13:28:46 -0400 From: Olga Kornievskaia To: , CC: Subject: [PATCH v4 07/11] NFS also send OFFLOAD_CANCEL to source server Date: Thu, 28 Sep 2017 13:28:35 -0400 Message-ID: <20170928172839.50741-8-kolga@netapp.com> In-Reply-To: <20170928172839.50741-1-kolga@netapp.com> References: <20170928172839.50741-1-kolga@netapp.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-nfs-owner@vger.kernel.org List-ID: In case of copy is cancelled, also send OFFLOAD_CANCEL to the source server. Signed-off-by: Olga Kornievskaia --- fs/nfs/nfs42proc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c index 79af87d..b786d33 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, if (copy->count <= 0) 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 ssize_t _nfs42_proc_copy(struct file *src, -- 1.8.3.1