From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox Subject: [PATCH v9 06/61] fscache: Use appropriate radix tree accessors Date: Tue, 13 Mar 2018 06:25:44 -0700 Message-ID: <20180313132639.17387-7-willy@infradead.org> References: <20180313132639.17387-1-willy@infradead.org> Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=gTwaAOmkxOUrfIJir/pggY0Nw3BL5DZX3vgbsCoydCU=; b=ZNuePZtCg2ARwrfWaWedkJLN5 R19qOk2oZQhdD9UckLMFHiq05IC4g6CJP3Qbnh5tiBWAHiFeZxL/zXQ71PBX76OYPBFQjOz/0kQ6k eLVHMxCFeTJMy2nL55h7Y31xAgkb/3FO12r4cSJ4vDkyCZTPluenpRY8ikMwcBbVISt9f67lY97RI l/bFppkMj2ZgB61uv01WiTo1et5zEo+No4Gx8bzj9qXsK4dMbLr4z+hKrPdrH32Sa3DyiCCwGuJj7 93xKSlZ8/Rul9shatB0B/HtZfTqDie9RJ7EiQ6LnXQ3cQ7LWTWymaxJFWUtBkMbrKpg1Ph0kAaPxY In-Reply-To: <20180313132639.17387-1-willy@infradead.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Andrew Morton Cc: Matthew Wilcox , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Ryusuke Konishi , linux-nilfs@vger.kernel.org From: Matthew Wilcox Don't open-code accesses to data structure internals. Signed-off-by: Matthew Wilcox Reviewed-by: Jeff Layton --- fs/fscache/cookie.c | 2 +- fs/fscache/object.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c index ff84258132bb..e9054e0c1a49 100644 --- a/fs/fscache/cookie.c +++ b/fs/fscache/cookie.c @@ -608,7 +608,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire) /* Clear pointers back to the netfs */ cookie->netfs_data = NULL; cookie->def = NULL; - BUG_ON(cookie->stores.rnode); + BUG_ON(!radix_tree_empty(&cookie->stores)); if (cookie->parent) { ASSERTCMP(atomic_read(&cookie->parent->usage), >, 0); diff --git a/fs/fscache/object.c b/fs/fscache/object.c index 7a182c87f378..aa0e71f02c33 100644 --- a/fs/fscache/object.c +++ b/fs/fscache/object.c @@ -956,7 +956,7 @@ static const struct fscache_state *_fscache_invalidate_object(struct fscache_obj * retire the object instead. */ if (!fscache_use_cookie(object)) { - ASSERT(object->cookie->stores.rnode == NULL); + ASSERT(radix_tree_empty(&object->cookie->stores)); set_bit(FSCACHE_OBJECT_RETIRED, &object->flags); _leave(" [no cookie]"); return transit_to(KILL_OBJECT); -- 2.16.1