From patchwork Mon Oct 29 17:40:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Kornievskaia X-Patchwork-Id: 990460 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iO16EAq2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42kMMy0frGz9s9m for ; Tue, 30 Oct 2018 04:41:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728046AbeJ3Cav (ORCPT ); Mon, 29 Oct 2018 22:30:51 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:44777 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726330AbeJ3Cav (ORCPT ); Mon, 29 Oct 2018 22:30:51 -0400 Received: by mail-qk1-f196.google.com with SMTP id n12so5450868qkh.11; Mon, 29 Oct 2018 10:41:14 -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=iO16EAq2S7E91Xfvz1LSANX2tqNBqF8MoSzDlFFR35GPdq/Mvc3O79TnChN8wbpA3G FV7um+XuaFsp5oXe++8xBsfnegv7JlN5HRSpu4flZ4aSHikLS0aEWZBd/C1iLJdeOgw7 hgmNjnSkzG4P9JyJ8eTGgXypf+MRWDHXwHH2OCYVbLcW0DE9rZmjR6opzQZ8BGqtuRXz /9A6qVqfv3lZlmAADwLezzwjjObS+l1lH2R1LUh03ArA/Jtw8jI9Rp4lZKYbt9UBPf/R gSnq8CklBX0A+kvZLYX20Gf0e45dZrE6/m0LRfGdOSrQT1YiJKpFegRl/KcPhzUmSIl5 S4og== 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=sXF1LmrhFuUuIz1ZL0AB5f8JOL6bBLa66Bgut2FOllKUGnVd0gGyWB3s7hOhrqnHCf o7U0su7Hin7ePYQEHRV43Xah0AmFC8gePU0T2Md+JlWpWy0FSCPycTgksviBTdyKVu2j F41olLBGTnOuJnG6nKYApYmpg2kQCb1HGlbLI7TxC/qqWdX4iNcNHifcXZsA5RCd73Zh Q0Pa0Zdcgj2ZnKs2tk9UuoP/NlYCBypSqyfl12xJYB/LbeGGilxJ5CXekUyQZWx1ROhC 2EcZONn8WzyoA7MOBTY0Rd0xHX6URK/y5GYtXu6tRBlJkaPvgbfIQ+3I2WYF37puQkHc eEnQ== X-Gm-Message-State: AGRZ1gKcBgTqxy4X6kYT/N1C2hThtQJsEns2zW1bC9ce3J++6UwebxFT KD9Tkcka5P58/1BSCkN7ucg= X-Google-Smtp-Source: AJdET5fLJjUJmGOLPCRByX/hJz2+Y4l5MrziZgizEnsBxSPnJmLlIG71509QUz2ksx3bEc21MoSBug== X-Received: by 2002:a37:c68c:: with SMTP id s12mr13295318qkl.66.1540834873886; Mon, 29 Oct 2018 10:41:13 -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 n190-v6sm13148929qkb.29.2018.10.29.10.41.12 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Oct 2018 10:41:13 -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 v5 07/12] NFS: also send OFFLOAD_CANCEL to source server Date: Mon, 29 Oct 2018 13:40:54 -0400 Message-Id: <20181029174059.38326-9-olga.kornievskaia@gmail.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20181029174059.38326-1-olga.kornievskaia@gmail.com> References: <20181029174059.38326-1-olga.kornievskaia@gmail.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@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 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,