From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EA0EC0030B for ; Fri, 6 Sep 2019 19:46:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 04D90214E0 for ; Fri, 6 Sep 2019 19:46:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bUwu4sk+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392221AbfIFTqj (ORCPT ); Fri, 6 Sep 2019 15:46:39 -0400 Received: from mail-io1-f65.google.com ([209.85.166.65]:41443 "EHLO mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727053AbfIFTqj (ORCPT ); Fri, 6 Sep 2019 15:46:39 -0400 Received: by mail-io1-f65.google.com with SMTP id r26so15344877ioh.8 for ; Fri, 06 Sep 2019 12:46:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qbMlSBpf06q9f17aggELxyyLLTxlNI3h6Qh/Z4qZNW4=; b=bUwu4sk+0MImOxqv79lWM1M6IyvQRdSROOTwn+LEs4r8SCvAXGMw0aOKgMIrONlI/G ASRQrQgcMbNPQeOmGZjIyzCrJQ25QbERiyyf9FMFdkhKF/mf7phavv3/tqJLL+DnSXxL 56giWW0Ich5diR0ZWfF0sJ4lhY5iZxxcNOvgKF09+kp6c9miF62jnXkrh81UrWSUvAld c+3zlPeM0Lyeck9Jq8y4Nk/mwT2jCh9k7rGk9T9cJQpW+WuuLHodDYT0ut2xKv5DSkjM 84o4FMvPq61EJdRveCwwt4BgDgYHL9DD/7FG/ZunbDmeByuUfbiPwiS4OxXT5JKm6hU3 X92g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qbMlSBpf06q9f17aggELxyyLLTxlNI3h6Qh/Z4qZNW4=; b=NYXFih2egvj4xlGqHmUFVR2p3zlTytlP3iopXkWM64ut7YMkOgimD0NH+ZsA9zH4EM 9QaccDqGJOXIbeqTjuqI0UYXEG1nEd/pidE7AYFGwZWJFGqbvm7uzCHH5Hv5D3FXiOo4 2fZE7aNcQupU+u5P//5heZlz9mdYtBc239OPETIt4r6CUnxasEKSITmAJWUUEu85asWa gKXqWthxnZZmhQGePJ/xhmRVzjsg/5i+rVx9cqqW8hOFssiMKNd/Y9SWp0ZRmuHumpWT V8IbOmh0upc0JYsacB83LcTda61NZIdbONbGp4HPxCu5rBIXfQzt4G0AqO148kbHQNzs p1nw== X-Gm-Message-State: APjAAAVnsSzgMUlfUMivE+kD1w+ULaXjvzhZ5bUMz2YBQMU/SmvRYypV 1vuuag0XuZdpgca+HBv9VpI= X-Google-Smtp-Source: APXvYqyRcwEGbaHiIfWvFRr2EWCdyNN4Zy2jYSCbj8+UindlFghkglKfjFtPAY4EvhsmmlipazhmrA== X-Received: by 2002:a02:a516:: with SMTP id e22mr11859833jam.77.1567799198190; Fri, 06 Sep 2019 12:46:38 -0700 (PDT) Received: from Olgas-MBP-201.attlocal.net (172-10-226-31.lightspeed.livnmi.sbcglobal.net. [172.10.226.31]) by smtp.gmail.com with ESMTPSA id i14sm5118085ioi.47.2019.09.06.12.46.37 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 06 Sep 2019 12:46:37 -0700 (PDT) From: Olga Kornievskaia To: trond.myklebust@hammerspace.com, anna.schumaker@netapp.com, bfields@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v6 04/19] NFS: also send OFFLOAD_CANCEL to source server Date: Fri, 6 Sep 2019 15:46:16 -0400 Message-Id: <20190906194631.3216-5-olga.kornievskaia@gmail.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20190906194631.3216-1-olga.kornievskaia@gmail.com> References: <20190906194631.3216-1-olga.kornievskaia@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Olga Kornievskaia 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 e34ade8..bbf7c1e 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, -- 1.8.3.1