From patchwork Sat Sep 17 05:13:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9336983 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 5CB296077F for ; Sat, 17 Sep 2016 05:13:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F3AE29FBE for ; Sat, 17 Sep 2016 05:13:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4416829FCF; Sat, 17 Sep 2016 05:13:55 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 8BBA229FBE for ; Sat, 17 Sep 2016 05:13:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755046AbcIQFNx (ORCPT ); Sat, 17 Sep 2016 01:13:53 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:36477 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753327AbcIQFNu (ORCPT ); Sat, 17 Sep 2016 01:13:50 -0400 Received: by mail-it0-f66.google.com with SMTP id n143so1844766ita.3 for ; Fri, 16 Sep 2016 22:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=dLH9WsJIZZSST7MWCdUu73iJC/5/J53n02Ct+Ro6HdM=; b=tFSNqDfgkVULW4FpF48bABNx3BIbBBliEzTms3qo/Xu4DbBdZUAw803TjCiAEDMzBt MoAOB2O3KbgDY4OPN0hdrliW928nOJS+USjDHMC6MF/5n1gjMPGPpW5KsQVtb+E0Tnmv KPB0Fs1RijfabWkuWpA4lMgEbA78gFIGn05S5PLftqBR3hlnl6GUfx7L6l2NkZrKm6d2 enw6eoBPcVRIR3D/yD6XfAr6lX6+wy824MfBN7Idew97JKNbNBbHuzgFrWwjA0yW2w/C AF/NQ+XMUr7YdnL8BgJ6DyXRaE8+e3iVwrF7pctZG6KcxsT5cvFfGQy6kzxnau2L709X T+og== 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:cc:subject:date:message-id :in-reply-to:references; bh=dLH9WsJIZZSST7MWCdUu73iJC/5/J53n02Ct+Ro6HdM=; b=alQ8qi1ZfSWwI6M9VPXZ+4RroBtlW+2uutUGWS1pDnwo0bzoB53BVGRq7V7TQ6gL9R TVlqku7Fttvo+Gc6eLEszn0kN+XB3u4AV52scRoblTRFAnNrRRdhVIXTTNkd9QOPM/3x zCp/U0fwjJdDfJ2mhUeChe6DKe8nx609A6ddYl5FezKCtKwJZtYrb4Avib++Ei3LPnnY mERF2K0OCEonk2BUgRGwqUXIY4RueDoRgihGweTh73zCb7W1oy98wmFLHCWVTGkoDr4v HcTE2FVj/1MQkPZGSY461c5O+41arK7Y16JxNquQjM+0ZJRI2US0/vnSxJ927gvKanTu FX7w== X-Gm-Message-State: AE9vXwONDiaAkN5Cj5lDSStWin92KpQnRkF/AL/VF0ONgM5w8o9bF6Q8LwO0rsj1yft8Ig== X-Received: by 10.36.60.131 with SMTP id m125mr927978ita.4.1474089229697; Fri, 16 Sep 2016 22:13:49 -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 d15sm4993916ioj.19.2016.09.16.22.13.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 22:13:49 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v5 15/25] NFSv4: nfs_inode_find_delegation_state_and_recover() should check all stateids Date: Sat, 17 Sep 2016 01:13:23 -0400 Message-Id: <1474089213-104014-16-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474089213-104014-15-git-send-email-trond.myklebust@primarydata.com> References: <1474089213-104014-1-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-2-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-3-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-4-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-5-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-6-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-7-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-8-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-9-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-10-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-11-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-12-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-13-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-14-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-15-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 Modify the helper nfs_inode_find_delegation_state_and_recover() so that it can check all stateids for whether or not they need recovery. Signed-off-by: Trond Myklebust --- fs/nfs/delegation.c | 18 ++++++++++++++++++ fs/nfs/delegation.h | 2 ++ fs/nfs/nfs4state.c | 44 +++++++++++++++++++++++++++++++++++++++----- 3 files changed, 59 insertions(+), 5 deletions(-) diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 34aa5dfbe99e..11d49e1aa41b 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -992,6 +992,24 @@ restart: rcu_read_unlock(); } +void nfs_inode_find_delegation_state_and_recover(struct inode *inode, + const nfs4_stateid *stateid) +{ + struct nfs_client *clp = NFS_SERVER(inode)->nfs_client; + struct nfs_delegation *delegation; + bool found = false; + + rcu_read_lock(); + delegation = rcu_dereference(NFS_I(inode)->delegation); + if (delegation && nfs4_stateid_match(&delegation->stateid, stateid)) { + nfs_mark_test_expired_delegation(NFS_SERVER(inode), delegation); + found = true; + } + rcu_read_unlock(); + if (found) + nfs4_schedule_state_manager(clp); +} + /** * nfs_delegations_present - check for existence of delegations * @clp: client state handle diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h index 1442e3b1521d..e9d555796873 100644 --- a/fs/nfs/delegation.h +++ b/fs/nfs/delegation.h @@ -66,6 +66,8 @@ void nfs_mark_delegation_referenced(struct nfs_delegation *delegation); int nfs4_have_delegation(struct inode *inode, fmode_t flags); int nfs4_check_delegation(struct inode *inode, fmode_t flags); bool nfs4_delegation_flush_on_close(const struct inode *inode); +void nfs_inode_find_delegation_state_and_recover(struct inode *inode, + const nfs4_stateid *stateid); #endif diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 63da0411e2af..609643f31e7a 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1337,6 +1337,35 @@ int nfs4_schedule_stateid_recovery(const struct nfs_server *server, struct nfs4_ } EXPORT_SYMBOL_GPL(nfs4_schedule_stateid_recovery); +static struct nfs4_lock_state * +nfs_state_find_lock_state_by_stateid(struct nfs4_state *state, + const nfs4_stateid *stateid) +{ + struct nfs4_lock_state *pos; + + list_for_each_entry(pos, &state->lock_states, ls_locks) { + if (!test_bit(NFS_LOCK_INITIALIZED, &pos->ls_flags)) + continue; + if (nfs4_stateid_match(&pos->ls_stateid, stateid)) + return pos; + } + return NULL; +} + +static bool nfs_state_lock_state_matches_stateid(struct nfs4_state *state, + const nfs4_stateid *stateid) +{ + bool found = false; + + if (test_bit(LK_STATE_IN_USE, &state->flags)) { + spin_lock(&state->state_lock); + if (nfs_state_find_lock_state_by_stateid(state, stateid)) + found = true; + spin_unlock(&state->state_lock); + } + return found; +} + void nfs_inode_find_state_and_recover(struct inode *inode, const nfs4_stateid *stateid) { @@ -1351,14 +1380,19 @@ void nfs_inode_find_state_and_recover(struct inode *inode, state = ctx->state; if (state == NULL) continue; - if (!test_bit(NFS_DELEGATED_STATE, &state->flags)) - continue; - if (!nfs4_stateid_match(&state->stateid, stateid)) + if (nfs4_stateid_match(&state->stateid, stateid)) { + nfs4_state_mark_reclaim_nograce(clp, state); + found = true; continue; - nfs4_state_mark_reclaim_nograce(clp, state); - found = true; + } + if (nfs_state_lock_state_matches_stateid(state, stateid)) { + nfs4_state_mark_reclaim_nograce(clp, state); + found = true; + } } spin_unlock(&inode->i_lock); + + nfs_inode_find_delegation_state_and_recover(inode, stateid); if (found) nfs4_schedule_state_manager(clp); }