From patchwork Fri Oct 19 15:28:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Kornievskaia X-Patchwork-Id: 10649641 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 8E5E8181D for ; Fri, 19 Oct 2018 15:29:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D04027F92 for ; Fri, 19 Oct 2018 15:29:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7170727F94; Fri, 19 Oct 2018 15:29:18 +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=ham 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 0EF4F27F92 for ; Fri, 19 Oct 2018 15:29:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726976AbeJSXfv (ORCPT ); Fri, 19 Oct 2018 19:35:51 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:34556 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726860AbeJSXfv (ORCPT ); Fri, 19 Oct 2018 19:35:51 -0400 Received: by mail-qk1-f194.google.com with SMTP id p6-v6so21260913qkg.1 for ; Fri, 19 Oct 2018 08:29:16 -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=AGZgyO5kJh0DiSIodRJJI3pe7WoZ/7FHwbOJ1hIFN+k=; b=ZS/oRth7iXqoX351JDVRqZWpOX4lvOBoBSamqIsNWHFtd/bL/s3L26bleRYcBAHirg /Rb/iDUWX36B0BwlDdJfP6CRFoFo1c/93AE95dL/34Czg1Guuw6KB0mH+K4EJCgC6pbD +hte0YHZ7ATLMxV52S5O7gGwXv4j9Dc+i1zhoaVHISusK3E3RWFaOP/YOiDPd/roSogk SXJQaRIgWzjFQeJXttSUeI5/Kobq/QId/81JOJEeSg1r1ELpcAwboomUWfUpFL+4Oo53 03QYKjyzHh7Sl9NE3GiUMSNVCtcohF+b4uvk2XEFG6rYStAoBRIFgwz1Di/cRqzzAvqx nZIw== 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=AGZgyO5kJh0DiSIodRJJI3pe7WoZ/7FHwbOJ1hIFN+k=; b=CKV3W81kmcQYlKLkRJjxQgCHGGnbnY5lLq9UWb73nIJ9KWrU4N80aMYoIKFfpNUi69 VdFR5qJ6f/r6E/7dhJqD0Quvo8T8IoaCFnBE6Q5vmSJEDGMrg3Or4Xa+U0DnVYLUyHdT dCrZZWViPilnH4WBA/FnjkFLse/CO98XR+qOS7xXHfeCiik0kyJTau2Gxh0vMuirDpml 7xeS6nWO/2PSiK/rHs17mN1uxhUt6q6CS45jWOqkBIIMnlOWkggO8YNs3//kBpohkqoY I7r7AeoKKMAl6ayO9UXLsQEDV7ho3CY0GmDgwZjp1ThFgM50TpwiuakTrI4qD2px0L4O XGNQ== X-Gm-Message-State: ABuFfojgYy4MSJgTjtvgFRljCApWaVoqEXPTBOPCFDiclv3f/oEpTmh4 xFhudizcAUsvykqtPsgQcLE= X-Google-Smtp-Source: ACcGV637/Pb2kgbVxK+u6amD5bVOzyl0NhF1rvhpIEtKjMFbgEujPe0Y2tbpNw88w7FzlOHSgfDukw== X-Received: by 2002:a37:1025:: with SMTP id a37-v6mr11808413qkh.299.1539962955736; Fri, 19 Oct 2018 08:29:15 -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 s17-v6sm18126231qtj.31.2018.10.19.08.29.14 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 19 Oct 2018 08:29:15 -0700 (PDT) From: Olga Kornievskaia To: bfields@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 05/13] NFS skip recovery of copy open on dest server Date: Fri, 19 Oct 2018 11:28:57 -0400 Message-Id: <20181019152905.32418-6-olga.kornievskaia@gmail.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20181019152905.32418-1-olga.kornievskaia@gmail.com> References: <20181019152905.32418-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 f229864..8b00c90 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 f82cb05..7909cd4 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -309,6 +309,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);