From patchwork Mon Oct 29 19:03:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Kornievskaia X-Patchwork-Id: 990500 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="bGkqSd4j"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42kPCs2W6gz9sBq for ; Tue, 30 Oct 2018 06:04:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729499AbeJ3DyV (ORCPT ); Mon, 29 Oct 2018 23:54:21 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:41912 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725969AbeJ3DyV (ORCPT ); Mon, 29 Oct 2018 23:54:21 -0400 Received: by mail-qt1-f193.google.com with SMTP id l41-v6so10573971qtl.8; Mon, 29 Oct 2018 12:04:22 -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=fwlJnXfUGTRII/SW0YspOWGhfPFdbZ3Rgyeu7Z/VErM=; b=bGkqSd4jvN+T3Jg18VKGI4GP4V4VmwVuy/tUtGdRkeI5wzZl0lv3nnhPg2DvxcYBia nOXnmo4doGUALHp/Q5rLtrJ/jr32c0tN24HubNgsdTB17dLz6yvaOeohxa6Nm3YY87Wy jEXiDIoKsjKgH0eJNW8r1RGpSX4e22+dvdf4C26BAhQz/DXbqGmFrffsXmPJKoMdv773 9N6ohzVd9A/N66zQrUY27aexNUdtRWO70d3xIltcQjKCsWe6qr3ZFMMZWEl/s1aBDg8S O6Yj3WWBpCiPROcxfWJeQbe5ZTGfXyg7Z9aWQIc9O422Oyge7eTPUKvIndBgCMLi9+tr qegA== 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=fwlJnXfUGTRII/SW0YspOWGhfPFdbZ3Rgyeu7Z/VErM=; b=j4YbMx7LxkWmjROYux0+0kjhgQd8F9Lb4YqgqhtF5fcsBx5dT5gi7dzs8yPHtqlMhT +8mOiRhbQAqlzhG+QrHmsw6tPumR1dQuCSrvY7tk5lK41Ag5M11WvThw6YpssKpovK+F ftEwNrHEGJpRwoopepTmeTx4+12qhHwhpDfK943R1tkdkdWbTAhtS3gug0sLIhsVBkjR zpqoQJzq8VfwGaCl5Qsq/tfJOY1hZc69A3vzhkOa6QirSGkKnUKGpOsJeOpTE7P93WF9 gHnbRRO85wBEAkoBSr6iqNOluBQuRVSLLQUNj6krqPqFI0h3sCWyPUi1ch44HkUrr/ak 6H8g== X-Gm-Message-State: AGRZ1gIy1Io299swxgDOfeIXhdzHIShYpla337D6wGU77tjtdvDBfPjV 1u5lP14eGzOVIz4tvZcPY/Wg/Baw X-Google-Smtp-Source: AJdET5elM1dsFDyqq09yYrEcyJFqaGRQj94/ULj3D8zXo8LBcpY0GTopLwca/argRL/NSLE/CiXIBg== X-Received: by 2002:a0c:eb07:: with SMTP id j7mr9516163qvp.128.1540839862007; Mon, 29 Oct 2018 12:04:22 -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 c5-v6sm2714373qtj.55.2018.10.29.12.04.20 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Oct 2018 12:04:21 -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 v6 11/12] NFS: COPY handle ERR_OFFLOAD_DENIED Date: Mon, 29 Oct 2018 15:03:56 -0400 Message-Id: <20181029190357.38439-13-olga.kornievskaia@gmail.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20181029190357.38439-1-olga.kornievskaia@gmail.com> References: <20181029190357.38439-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 If server sends ERR_OFFLOAD_DENIED error, the client must fall back on doing copy the normal way. Return ENOTSUPP to the vfs and fallback to regular copy. Signed-off-by: Olga Kornievskaia --- fs/nfs/nfs42proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c index 00809b3..c7c2ffa 100644 --- a/fs/nfs/nfs42proc.c +++ b/fs/nfs/nfs42proc.c @@ -395,7 +395,8 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src, args.sync = true; dst_exception.retry = 1; continue; - } else if (err == -ESTALE && + } else if ((err == -ESTALE || + err == -NFS4ERR_OFFLOAD_DENIED) && !nfs42_files_from_same_server(src, dst)) { nfs42_do_offload_cancel_async(src, &args.src_stateid); err = -EOPNOTSUPP;