From patchwork Fri Oct 26 20:10: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: 10657837 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 7C3A6180E for ; Fri, 26 Oct 2018 20:11:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70CDB2CA46 for ; Fri, 26 Oct 2018 20:11:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 64B902CA52; Fri, 26 Oct 2018 20:11:15 +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 106C32CA46 for ; Fri, 26 Oct 2018 20:11:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728013AbeJ0Etg (ORCPT ); Sat, 27 Oct 2018 00:49:36 -0400 Received: from mail-qt1-f196.google.com ([209.85.160.196]:36021 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727985AbeJ0Etg (ORCPT ); Sat, 27 Oct 2018 00:49:36 -0400 Received: by mail-qt1-f196.google.com with SMTP id u34-v6so2693580qth.3; Fri, 26 Oct 2018 13:11:12 -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=DPNcOzxVCvrJ/vJo74vIKYId6CZPiw5FY+8b6zX+wT0=; b=gy8eyHPlRAUoyeJkPbfzT9fnN3bvrdPPSD0PVTUc3DbecuTRFR29MIF/eflqdh4edd W8aL0cXLDMknuWXMKT2PaAZgsHnVYEm3sHbcQk5e5vc/Y6NtJ8Tt2K9LwDO8+G341Feh O2qB9iIqhkNfvFUzZicnlHrGbkkNZ9cTsV1RWAuSUaOz9pMePialToR5qB1RTZ31dRGj l9Xx7KJk/HpDYN9O2ljQYjnx9ogYwwjbxW5Xkx2UiFyF0IRf3oeYZp20ICVs7eqnJDNV /WMuK78GX5c3wJWNfqR56W3QWbymVM0mnXhyV0pJyQY60obYICUsZ6oCKSkAzEhmdfI2 uKsA== 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=DPNcOzxVCvrJ/vJo74vIKYId6CZPiw5FY+8b6zX+wT0=; b=O9aWIcdTl8BN6FXwHEhCSOqu9uzVUIUiRqlNHCZIxE4Qr7dwcGuuXjERLxzHQ3qKKr 0Eb2ZJQ0vbFh5Le4iF9ERb9uj4Rv8c4UF0DsqiTQVszIuUN29c9I5tpX2KhVErr//bEy oZwVD5tTnRMmJPh5nPMVBV7xz3pQ0XW1Ti9qxAwm3yr/5OXvWMC1ROOKdte+5JJZfbLu oSduvg8sqsjGm24dVQCUtvtTavEg63HjeURgjK/1hyt98TVe7iu9irbjJAAxKwTHhKp8 RoGD9KYQm/CC4bi0Qc7a08mP2DuOL+JbSXEq6ZQ6cHC8eY3GRbaAVWQ+CcDGRaop6sfU r3Fg== X-Gm-Message-State: AGRZ1gIjehyj6uyWjeCHu5iQ4dMYHn905aTe9on7vXf5SLVc/itr04+7 plYHWiknTUFxn/4zePigzUc= X-Google-Smtp-Source: AJdET5feH0ju6zbxZZxknPkfHMPiXObC8Ay+QzS+Km5vIN+Rw5J2qN/TONMC1MQ/HqoHzq0oAp37zQ== X-Received: by 2002:a0c:9de7:: with SMTP id p39mr4643100qvf.82.1540584672481; Fri, 26 Oct 2018 13:11:12 -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-v6sm8037667qkc.96.2018.10.26.13.11.11 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 26 Oct 2018 13:11:11 -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 v4 08/11] NFS: skip recovery of copy open on dest server Date: Fri, 26 Oct 2018 16:10:54 -0400 Message-Id: <20181026201057.36899-10-olga.kornievskaia@gmail.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20181026201057.36899-1-olga.kornievskaia@gmail.com> References: <20181026201057.36899-1-olga.kornievskaia@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Olga Kornievskaia Mark the open created for the source file on the destination server. Then if this open is going thru a recovery, then fail the recovery as we don't need to be recoving a "fake" open. We need to fail the ongoing READs and vfs_copy_file_range(). Signed-off-by: Olga Kornievskaia --- fs/nfs/nfs4_fs.h | 1 + fs/nfs/nfs4file.c | 1 + fs/nfs/nfs4state.c | 14 ++++++++++++++ 3 files changed, 16 insertions(+) diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 9c566a4..482754d 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -165,6 +165,7 @@ enum { NFS_STATE_CHANGE_WAIT, /* A state changing operation is outstanding */ #ifdef CONFIG_NFS_V4_2 NFS_CLNT_DST_SSC_COPY_STATE, /* dst server open state on client*/ + NFS_SRV_SSC_COPY_STATE, /* ssc state on the dst server */ #endif /* CONFIG_NFS_V4_2 */ }; diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index 19b1b3f..2f31f30 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -330,6 +330,7 @@ struct file * if (ctx->state == NULL) goto out_stateowner; + set_bit(NFS_SRV_SSC_COPY_STATE, &ctx->state->flags); set_bit(NFS_OPEN_STATE, &ctx->state->flags); memcpy(&ctx->state->open_stateid.other, &stateid->other, NFS4_STATEID_OTHER_SIZE); diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 62ae0fd..b0b82c6 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1606,6 +1606,9 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs { struct nfs4_state *state; int status = 0; +#ifdef CONFIG_NFS_V4_2 + bool found_ssc_copy_state = false; +#endif /* CONFIG_NFS_V4_2 */ /* Note: we rely on the sp->so_states list being ordered * so that we always reclaim open(O_RDWR) and/or open(O_WRITE) @@ -1625,6 +1628,13 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs continue; if (state->state == 0) continue; +#ifdef CONFIG_NFS_V4_2 + if (test_bit(NFS_SRV_SSC_COPY_STATE, &state->flags)) { + nfs4_state_mark_recovery_failed(state, -EIO); + found_ssc_copy_state = true; + continue; + } +#endif /* CONFIG_NFS_V4_2 */ refcount_inc(&state->count); spin_unlock(&sp->so_lock); status = __nfs4_reclaim_open_state(sp, state, ops); @@ -1671,6 +1681,10 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs } raw_write_seqcount_end(&sp->so_reclaim_seqcount); spin_unlock(&sp->so_lock); +#ifdef CONFIG_NFS_V4_2 + if (found_ssc_copy_state) + return -EIO; +#endif /* CONFIG_NFS_V4_2 */ return 0; out_err: nfs4_put_open_state(state);