FS-Cache: Simplify cookie retention for fscache_objects, fixing oops

[linux-2.6-block.git] / fs / cachefiles / xattr.c

diff --git a/fs/cachefiles/xattr.c b/fs/cachefiles/xattr.c
index 73b46288b54b839c523289a5471a376f14097e9c..2476e5162609ffc4db6be49549e27999e288f06f 100644 (file)
--- 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,