aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/fscache/cookie.c2
-rw-r--r--fs/fscache/object.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
index 7dc55b93a830..97137d7ec5ee 100644
--- a/fs/fscache/cookie.c
+++ b/fs/fscache/cookie.c
@@ -832,7 +832,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie,
832 /* Clear pointers back to the netfs */ 832 /* Clear pointers back to the netfs */
833 cookie->netfs_data = NULL; 833 cookie->netfs_data = NULL;
834 cookie->def = NULL; 834 cookie->def = NULL;
835 BUG_ON(cookie->stores.rnode); 835 BUG_ON(!radix_tree_empty(&cookie->stores));
836 836
837 if (cookie->parent) { 837 if (cookie->parent) {
838 ASSERTCMP(atomic_read(&cookie->parent->usage), >, 0); 838 ASSERTCMP(atomic_read(&cookie->parent->usage), >, 0);
diff --git a/fs/fscache/object.c b/fs/fscache/object.c
index 1085ca12e25c..20e0d0a4dc8c 100644
--- a/fs/fscache/object.c
+++ b/fs/fscache/object.c
@@ -973,7 +973,7 @@ static const struct fscache_state *_fscache_invalidate_object(struct fscache_obj
973 * retire the object instead. 973 * retire the object instead.
974 */ 974 */
975 if (!fscache_use_cookie(object)) { 975 if (!fscache_use_cookie(object)) {
976 ASSERT(object->cookie->stores.rnode == NULL); 976 ASSERT(radix_tree_empty(&object->cookie->stores));
977 set_bit(FSCACHE_OBJECT_RETIRED, &object->flags); 977 set_bit(FSCACHE_OBJECT_RETIRED, &object->flags);
978 _leave(" [no cookie]"); 978 _leave(" [no cookie]");
979 return transit_to(KILL_OBJECT); 979 return transit_to(KILL_OBJECT);