From patchwork Wed Oct 24 19:58:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Kornievskaia X-Patchwork-Id: 10654983 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 62A9117F3 for ; Wed, 24 Oct 2018 19:59:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51C382B221 for ; Wed, 24 Oct 2018 19:59:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 462B32B224; Wed, 24 Oct 2018 19:59:00 +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 DBC232B221 for ; Wed, 24 Oct 2018 19:58:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727508AbeJYE2Y (ORCPT ); Thu, 25 Oct 2018 00:28:24 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:40190 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727502AbeJYE2X (ORCPT ); Thu, 25 Oct 2018 00:28:23 -0400 Received: by mail-qt1-f194.google.com with SMTP id z9-v6so7097732qto.7; Wed, 24 Oct 2018 12:58:57 -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=Phkx7dtRxIh0Q2t3XHkNvjFUnOOqS0aUwmfPKMDFh7E=; b=jfufODN7HFoGMI0Ah4Xn1flPfv/4ZYEr0lOjAjNX1zay6Iv76v5zPewzoJAi+sjzLs JR5ih4U07Z9mN1gVQCnpNAiXzxMxGwMcQDHk+DIA5i/dX3LEjPHfoh2KJffglGDumvlo YGNbteW/BxGmCQxiW4L68g7GHuljM16oF/LzqVOGlYQBuKAoj16Gfwms6Y/emV7WmO0I wZt430mmXY17n/WmYDVXDviIDPVtwKCuOqgo+yPPIGRjbiWHuU1dJd31SM9Uef0E1xuI BBi9dlE9xBPyNjidCiLz/DaFPbXVOwcaZcxl+gZwB/OuULpKFtQnKzk4QM4h6AH9dr+W pMHA== 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=Phkx7dtRxIh0Q2t3XHkNvjFUnOOqS0aUwmfPKMDFh7E=; b=R0sfwhNAapvhVzjt/58RQvu0Svcv0nNJUFDgYMCiO63GIRwIVITMALCuDBqg9kNH94 64kQDQFGT/dCB6GFCIpRr+K/BJilMlWvDuvNIO5bf7iT3G0vg2ne/4/lYcr4V1Z4CLKn ivG6JqKxZZZ6LMuJkgLPtKQCYBoZwLs40X4gFPRFGVieyAY00DhZySOs80zZSIqXhbMH L51bu+C0hnwvAoOMgzjZfSVB+0+Wh62L4vsRqxMIK2gfLRbihnV4EUjbL+w4WRLsxCAV JuHeUt6qly/wtFv/UmI3yydpgNuS+/NyTptLRx9XuMCyN39WR/z/5VLGUve0hfeQ8BTL D3Zg== X-Gm-Message-State: AGRZ1gJsji1b35gnnDfGj5r3R3VPCPVkBa4a3PVNJ95EN++Rgy1xshKt Qbj9q2Q2WdBxCjB+VGrdbgc= X-Google-Smtp-Source: AJdET5cnvKbPVW+OjcXOjpsVLrqpPidLX7FfKRWfsX1xWp1QiLB8JkCgZoDUgGLY33LY7YZ7xvlU1A== X-Received: by 2002:ad4:408c:: with SMTP id l12mr3730114qvp.231.1540411136982; Wed, 24 Oct 2018 12:58:56 -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 d124-v6sm3872380qkf.85.2018.10.24.12.58.55 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 24 Oct 2018 12:58:56 -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 v2 11/13] NFS skip recovery of copy open on dest server Date: Wed, 24 Oct 2018 15:58:35 -0400 Message-Id: <20181024195837.35532-13-olga.kornievskaia@gmail.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20181024195837.35532-1-olga.kornievskaia@gmail.com> References: <20181024195837.35532-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 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 300880f..480b384 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);