From patchwork Thu Oct 25 21:51:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Kornievskaia X-Patchwork-Id: 10656711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7003913A9 for ; Thu, 25 Oct 2018 21:52:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38A552BC1C for ; Thu, 25 Oct 2018 21:52:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CF852C58A; Thu, 25 Oct 2018 21:52:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D46DB2BC1C for ; Thu, 25 Oct 2018 21:52:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727616AbeJZG0Z (ORCPT ); Fri, 26 Oct 2018 02:26:25 -0400 Received: from mail-qt1-f196.google.com ([209.85.160.196]:46431 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726511AbeJZG0Y (ORCPT ); Fri, 26 Oct 2018 02:26:24 -0400 Received: by mail-qt1-f196.google.com with SMTP id c16-v6so11760243qtj.13; Thu, 25 Oct 2018 14:52:00 -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=DqnHnZrMSvA0or48b6pnWzyYDz4iWYc8+TMTuA2+K94=; b=QnddPkDckqKa+JGCUJ7qr20TkexVq9wwfMJ38AvmzQ0qFwrB83H8J41/+FMivXcM+0 XwfJGJ39jkSgZ5F8Q1ehgoHdYKd+wmMuCsk3Z7WfdRbhVCysitutBAY/gg2Mxm414/NL hYE1uQljuQaqfJRs4JX5E95CWhqf56D7dzDLEu7+Nm3B5TErB5Qnkkiu/w/MIX8hDqIC udQtDdXWxn0Ek/kheRnAQmroDkUpqAPThXKLCqjQkgmfDcfhllXBYIDF4FHRo/n9wkkl kyeB+rvNWG3vc/YbgCNLAlH1PB6TVtm3/LoxHRnQEcB1SzyeLKx0lKS8Gjmp7eO4mDZF tSow== 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=DqnHnZrMSvA0or48b6pnWzyYDz4iWYc8+TMTuA2+K94=; b=ThMCo2C1aY6zdEX//w3AI8rTEOk3q97gmhjFRHGebT0QmqN317j6TENpIzSkv3ZjxR AFRdHwy2nt6lGLV2eVhefcUMZnLedfyJET7GCOd9BQWWPkpq0OZ0YstHaghO7+sHQcZ3 z5zcaPfqAyfaxv4Ukbw1HVHpiXqBNZJBRlrgPYTZ2D6pAJE2FVKRM9n+WXxL9OObd4G+ D5tKo52HcOLPNzDOwDeqPM72cftTbXT0WtBwL36/uLZpD/9E6HKZHZswVGq43C9qHuVF IsjUmVxySTJ9qt4Zx6yjbuKnUmDMhVovtjLk0N+y23DgUHTNNctLOF71CiJcrmyK+aXi Wqfw== X-Gm-Message-State: AGRZ1gIsfmGzvcbdLooXresB5lwoCAxflzYi96LBPL+m4Low/hIRtaWv HXqAilZ6LTN3xdjCuvYFCrA= X-Google-Smtp-Source: AJdET5cplp7pEsL4Fsfq5cs3nFx59YRz/fKsRd5savlaDa4uwJmNEHFgw5eq463Y2kxksXgNVjZ1eg== X-Received: by 2002:ac8:2932:: with SMTP id y47-v6mr929670qty.42.1540504320076; Thu, 25 Oct 2018 14:52:00 -0700 (PDT) Received: from Olgas-MBP-195.attlocal.net (172-10-226-31.lightspeed.livnmi.sbcglobal.net. [172.10.226.31]) by smtp.gmail.com with ESMTPSA id p64-v6sm5895927qkc.96.2018.10.25.14.51.58 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 25 Oct 2018 14:51:59 -0700 (PDT) From: Olga Kornievskaia To: trond.myklebust@hammerspace.com, anna.schumaker@netapp.com, viro@zeniv.linux.org.uk, smfrench@gmail.com, miklos@szeredi.hu Cc: linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-cifs@vger.kernel.org, linux-unionfs@vger.kernel.org, linux-man@vger.kernel.org Subject: [PATCH v3 06/11] NFS also send OFFLOAD_CANCEL to source server Date: Thu, 25 Oct 2018 17:51:42 -0400 Message-Id: <20181025215147.36248-8-olga.kornievskaia@gmail.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20181025215147.36248-1-olga.kornievskaia@gmail.com> References: <20181025215147.36248-1-olga.kornievskaia@gmail.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 bb9e799..98fe00b 100644 --- a/fs/nfs/nfs42proc.c +++ b/fs/nfs/nfs42proc.c @@ -205,12 +205,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,