1 files changed, 11 insertions, 6 deletions

diff --git a/fs/fscache/page.c b/fs/fscache/page.c
index 0fe42a6d0e9c..7f5c658af755 100644
--- a/fs/fscache/page.c
+++ b/fs/fscache/page.c
@@ -204,7 +204,8 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
 
         spin_lock(&cookie->lock);
 
-        if (hlist_empty(&cookie->backing_objects))
+        if (!fscache_cookie_enabled(cookie) ||
+            hlist_empty(&cookie->backing_objects))
                 goto nobufs;
         object = hlist_entry(cookie->backing_objects.first,
                              struct fscache_object, cookie_link);
@@ -410,7 +411,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
                 return -ERESTARTSYS;
 
         op = fscache_alloc_retrieval(cookie, page->mapping,
-                                     end_io_func,context);
+                                     end_io_func, context);
         if (!op) {
                 _leave(" = -ENOMEM");
                 return -ENOMEM;
@@ -419,7 +420,8 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
 
         spin_lock(&cookie->lock);
 
-        if (hlist_empty(&cookie->backing_objects))
+        if (!fscache_cookie_enabled(cookie) ||
+            hlist_empty(&cookie->backing_objects))
                 goto nobufs_unlock;
         object = hlist_entry(cookie->backing_objects.first,
                              struct fscache_object, cookie_link);
@@ -551,7 +553,8 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
 
         spin_lock(&cookie->lock);
 
-        if (hlist_empty(&cookie->backing_objects))
+        if (!fscache_cookie_enabled(cookie) ||
+            hlist_empty(&cookie->backing_objects))
                 goto nobufs_unlock;
         object = hlist_entry(cookie->backing_objects.first,
                              struct fscache_object, cookie_link);
@@ -666,7 +669,8 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
 
         spin_lock(&cookie->lock);
 
-        if (hlist_empty(&cookie->backing_objects))
+        if (!fscache_cookie_enabled(cookie) ||
+            hlist_empty(&cookie->backing_objects))
                 goto nobufs_unlock;
         object = hlist_entry(cookie->backing_objects.first,
                              struct fscache_object, cookie_link);
@@ -938,7 +942,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
         ret = -ENOBUFS;
         spin_lock(&cookie->lock);
 
-        if (hlist_empty(&cookie->backing_objects))
+        if (!fscache_cookie_enabled(cookie) ||
+            hlist_empty(&cookie->backing_objects))
                 goto nobufs;
         object = hlist_entry(cookie->backing_objects.first,
                              struct fscache_object, cookie_link);