1 files changed, 10 insertions, 3 deletions

diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c
index 746ce532e130..d4c1206af9fc 100644
--- a/fs/cachefiles/interface.c
+++ b/fs/cachefiles/interface.c
@@ -13,8 +13,6 @@
 #include <linux/mount.h>
 #include "internal.h"
 
-#define list_to_page(head) (list_entry((head)->prev, struct page, lru))
-
 struct cachefiles_lookup_data {
         struct cachefiles_xattr *auxdata;       /* auxiliary data */
         char                    *key;           /* key path */
@@ -212,20 +210,29 @@ static void cachefiles_update_object(struct fscache_object *_object)
         object = container_of(_object, struct cachefiles_object, fscache);
         cache = container_of(object->fscache.cache, struct cachefiles_cache,
                              cache);
+
+        if (!fscache_use_cookie(_object)) {
+                _leave(" [relinq]");
+                return;
+        }
+
         cookie = object->fscache.cookie;
 
         if (!cookie->def->get_aux) {
+                fscache_unuse_cookie(_object);
                 _leave(" [no aux]");
                 return;
         }
 
         auxdata = kmalloc(2 + 512 + 3, cachefiles_gfp);
         if (!auxdata) {
+                fscache_unuse_cookie(_object);
                 _leave(" [nomem]");
                 return;
         }
 
         auxlen = cookie->def->get_aux(cookie->netfs_data, auxdata->data, 511);
+        fscache_unuse_cookie(_object);
         ASSERTCMP(auxlen, <, 511);
 
         auxdata->len = auxlen + 1;
@@ -263,7 +270,7 @@ static void cachefiles_drop_object(struct fscache_object *_object)
 #endif
 
         /* delete retired objects */
-        if (object->fscache.state == FSCACHE_OBJECT_RECYCLING &&
+        if (test_bit(FSCACHE_COOKIE_RETIRED, &object->fscache.cookie->flags) &&
             _object != cache->cache.fsdef
             ) {
                 _debug("- retire object OBJ%x", object->fscache.debug_id);