3 files changed, 17 insertions, 12 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);
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
index 8c01c5fcdf75..25badd1aec5c 100644
--- a/fs/cachefiles/namei.c
+++ b/fs/cachefiles/namei.c
@@ -38,7 +38,7 @@ void __cachefiles_printk_object(struct cachefiles_object *object,
         printk(KERN_ERR "%sobject: OBJ%x\n",
                prefix, object->fscache.debug_id);
         printk(KERN_ERR "%sobjstate=%s fl=%lx wbusy=%x ev=%lx[%lx]\n",
-               prefix, fscache_object_states[object->fscache.state],
+               prefix, object->fscache.state->name,
                object->fscache.flags, work_busy(&object->fscache.work),
                object->fscache.events, object->fscache.event_mask);
         printk(KERN_ERR "%sops=%u inp=%u exc=%u\n",
@@ -127,10 +127,10 @@ static void cachefiles_mark_object_buried(struct cachefiles_cache *cache,
 found_dentry:
         kdebug("preemptive burial: OBJ%x [%s] %p",
                object->fscache.debug_id,
-               fscache_object_states[object->fscache.state],
+               object->fscache.state->name,
                dentry);
 
-        if (object->fscache.state < FSCACHE_OBJECT_DYING) {
+        if (fscache_object_is_live(&object->fscache)) {
                 printk(KERN_ERR "\n");
                 printk(KERN_ERR "CacheFiles: Error:"
                        " Can't preemptively bury live object\n");
@@ -192,7 +192,7 @@ try_again:
         /* an old object from a previous incarnation is hogging the slot - we
          * need to wait for it to be destroyed */
 wait_for_old_object:
-        if (xobject->fscache.state < FSCACHE_OBJECT_DYING) {
+        if (fscache_object_is_live(&object->fscache)) {
                 printk(KERN_ERR "\n");
                 printk(KERN_ERR "CacheFiles: Error:"
                        " Unexpected object collision\n");
@@ -836,7 +836,7 @@ static struct dentry *cachefiles_check_active(struct cachefiles_cache *cache,
         //       dir->d_name.len, dir->d_name.len, dir->d_name.name, filename);
 
         /* look up the victim */
-        mutex_lock_nested(&dir->d_inode->i_mutex, 1);
+        mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
 
         start = jiffies;
         victim = lookup_one_len(filename, dir, strlen(filename));
diff --git a/fs/cachefiles/xattr.c b/fs/cachefiles/xattr.c
index 73b46288b54b..2476e5162609 100644
--- a/fs/cachefiles/xattr.c
+++ b/fs/cachefiles/xattr.c
@@ -109,13 +109,12 @@ int cachefiles_set_object_xattr(struct cachefiles_object *object,
         struct dentry *dentry = object->dentry;
         int ret;
 
-        ASSERT(object->fscache.cookie);
         ASSERT(dentry);
 
         _enter("%p,#%d", object, auxdata->len);
 
         /* attempt to install the cache metadata directly */
-        _debug("SET %s #%u", object->fscache.cookie->def->name, auxdata->len);
+        _debug("SET #%u", auxdata->len);
 
         ret = vfs_setxattr(dentry, cachefiles_xattr_cache,
                            &auxdata->type, auxdata->len,
@@ -138,13 +137,12 @@ int cachefiles_update_object_xattr(struct cachefiles_object *object,
         struct dentry *dentry = object->dentry;
         int ret;
 
-        ASSERT(object->fscache.cookie);
         ASSERT(dentry);
 
         _enter("%p,#%d", object, auxdata->len);
 
         /* attempt to install the cache metadata directly */
-        _debug("SET %s #%u", object->fscache.cookie->def->name, auxdata->len);
+        _debug("SET #%u", auxdata->len);
 
         ret = vfs_setxattr(dentry, cachefiles_xattr_cache,
                            &auxdata->type, auxdata->len,