From patchwork Sun Jul 24 21:30:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9245063 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B32BA607FD for ; Sun, 24 Jul 2016 21:31:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7E3B2522B for ; Sun, 24 Jul 2016 21:31:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C41426224; Sun, 24 Jul 2016 21:31:36 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 28D762522B for ; Sun, 24 Jul 2016 21:31:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752492AbcGXVbf (ORCPT ); Sun, 24 Jul 2016 17:31:35 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:35428 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752448AbcGXVbe (ORCPT ); Sun, 24 Jul 2016 17:31:34 -0400 Received: by mail-it0-f65.google.com with SMTP id f6so6441320ith.2 for ; Sun, 24 Jul 2016 14:31:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Q4H8Owxv+aVgW1O2aw1DLUjJv4Xp+klB7PC62sQnmrQ=; b=bqV44fKNAy0F2Qt8PCfAD3Hdp3/073pC2BDJlGeYzcOEsjY5yxannS1Gld0hgFNioT vQxtthOeF8MrUNXDZh/JWS0T3ZqZ+ZREBAgX2tiK7E4bEfoA/NdgYs1XURUcYXrzTbzO wRiBP7S2UBQSPRPRjUv4iKH60r6u8t966DfS7YlKbJ8lvCtA5CPCWttTPT8Lab5pmKCb xSkZJanyDUyQRw65mxJEjcbAKopLOwFfqOhuRJG3Azhb7O7/0lFRFHNE2T9fe7GiWikV CI1vv/a7GvnSwtjIh7kwY1qWvfIes7SWAAF/NFetn/ofcNngd0xV5AdSJIyEbTuUQ4Nb vdzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=Q4H8Owxv+aVgW1O2aw1DLUjJv4Xp+klB7PC62sQnmrQ=; b=Feqsb2aPvAxnizC9BTEBeYvBje/j9L77AUvc+cwb61zqO8cApfb8nORwEA3v4VBNGQ z4CZg2RJ27MNiyETGcPu/OWLJ56dmRJW6iE8ic6VA2haTJGcrU+YE4EXuDdgUNQM2XHp 4THewUbFXg/3j7TVMWoGH3Vgrycxgz6bChLWDNL2zb4aBG7DNIXLnTNw7MbMgIleFZgz GgHc1HrDoUMR73JJEwaVDPURGOFjoPFe/EwToQS9CEIyhuu3kDFUbk/TwwlFdSe1nZhP YPJ66zP8o0JcEeQCeXByWOupWL+KJ0qWjo0fzSfFoCDhdeqSIg9am+cJgQDvAMRTHGXb lmPg== X-Gm-Message-State: ALyK8tKY0BqVKHpuE7AogyHWcN5x8lpEoTFwcmVZ3GJM2z1UBGR1W6qhwSEVjhNNJconlw== X-Received: by 10.36.64.5 with SMTP id n5mr32428943ita.78.1469395893785; Sun, 24 Jul 2016 14:31:33 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id r128sm8100341ita.6.2016.07.24.14.31.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jul 2016 14:31:32 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v3 01/14] pNFS: LAYOUTRETURN should only update the stateid if the layout is valid Date: Sun, 24 Jul 2016 17:30:46 -0400 Message-Id: <1469395859-83194-2-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469395859-83194-1-git-send-email-trond.myklebust@primarydata.com> References: <1469395859-83194-1-git-send-email-trond.myklebust@primarydata.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 If the layout was completely returned, then ignore the returned layout stateid. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 2 +- fs/nfs/pnfs.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index ff416d0e24bc..dc50ba4d84ad 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -8130,7 +8130,7 @@ static void nfs4_layoutreturn_release(void *calldata) pnfs_mark_matching_lsegs_invalid(lo, &freeme, &lrp->args.range, be32_to_cpu(lrp->args.stateid.seqid)); pnfs_mark_layout_returned_if_empty(lo); - if (lrp->res.lrs_present) + if (lrp->res.lrs_present && pnfs_layout_is_valid(lo)) pnfs_set_layout_stateid(lo, &lrp->res.stateid, true); pnfs_clear_layoutreturn_waitbit(lo); spin_unlock(&lo->plh_inode->i_lock); diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index b21bd0bee784..2f4f26905c03 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -375,6 +375,11 @@ static inline bool nfs_have_layout(struct inode *inode) return NFS_I(inode)->layout != NULL; } +static inline bool pnfs_layout_is_valid(const struct pnfs_layout_hdr *lo) +{ + return test_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags) == 0; +} + static inline struct nfs4_deviceid_node * nfs4_get_deviceid(struct nfs4_deviceid_node *d) {