Btrfs: fix space leak when we fail to reserve metadata space
[linux-2.6.git] / fs / ocfs2 / uptodate.c
index b8a00a7..52eaf33 100644 (file)
@@ -53,9 +53,6 @@
 #include <linux/highmem.h>
 #include <linux/buffer_head.h>
 #include <linux/rbtree.h>
-#include <linux/jbd.h>
-
-#define MLOG_MASK_PREFIX ML_UPTODATE
 
 #include <cluster/masklog.h>
 
 
 #include "inode.h"
 #include "uptodate.h"
+#include "ocfs2_trace.h"
 
 struct ocfs2_meta_cache_item {
        struct rb_node  c_node;
        sector_t        c_block;
 };
 
-static kmem_cache_t *ocfs2_uptodate_cachep = NULL;
+static struct kmem_cache *ocfs2_uptodate_cachep = NULL;
+
+u64 ocfs2_metadata_cache_owner(struct ocfs2_caching_info *ci)
+{
+       BUG_ON(!ci || !ci->ci_ops);
+
+       return ci->ci_ops->co_owner(ci);
+}
+
+struct super_block *ocfs2_metadata_cache_get_super(struct ocfs2_caching_info *ci)
+{
+       BUG_ON(!ci || !ci->ci_ops);
+
+       return ci->ci_ops->co_get_super(ci);
+}
+
+static void ocfs2_metadata_cache_lock(struct ocfs2_caching_info *ci)
+{
+       BUG_ON(!ci || !ci->ci_ops);
+
+       ci->ci_ops->co_cache_lock(ci);
+}
+
+static void ocfs2_metadata_cache_unlock(struct ocfs2_caching_info *ci)
+{
+       BUG_ON(!ci || !ci->ci_ops);
+
+       ci->ci_ops->co_cache_unlock(ci);
+}
+
+void ocfs2_metadata_cache_io_lock(struct ocfs2_caching_info *ci)
+{
+       BUG_ON(!ci || !ci->ci_ops);
+
+       ci->ci_ops->co_io_lock(ci);
+}
 
-void ocfs2_metadata_cache_init(struct inode *inode)
+void ocfs2_metadata_cache_io_unlock(struct ocfs2_caching_info *ci)
 {
-       struct ocfs2_inode_info *oi = OCFS2_I(inode);
-       struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
+       BUG_ON(!ci || !ci->ci_ops);
+
+       ci->ci_ops->co_io_unlock(ci);
+}
+
 
-       oi->ip_flags |= OCFS2_INODE_CACHE_INLINE;
+static void ocfs2_metadata_cache_reset(struct ocfs2_caching_info *ci,
+                                      int clear)
+{
+       ci->ci_flags |= OCFS2_CACHE_FL_INLINE;
        ci->ci_num_cached = 0;
+
+       if (clear) {
+               ci->ci_created_trans = 0;
+               ci->ci_last_trans = 0;
+       }
+}
+
+void ocfs2_metadata_cache_init(struct ocfs2_caching_info *ci,
+                              const struct ocfs2_caching_operations *ops)
+{
+       BUG_ON(!ops);
+
+       ci->ci_ops = ops;
+       ocfs2_metadata_cache_reset(ci, 1);
 }
 
+void ocfs2_metadata_cache_exit(struct ocfs2_caching_info *ci)
+{
+       ocfs2_metadata_cache_purge(ci);
+       ocfs2_metadata_cache_reset(ci, 1);
+}
+
+
 /* No lock taken here as 'root' is not expected to be visible to other
  * processes. */
 static unsigned int ocfs2_purge_copied_metadata_tree(struct rb_root *root)
@@ -91,8 +151,8 @@ static unsigned int ocfs2_purge_copied_metadata_tree(struct rb_root *root)
        while ((node = rb_last(root)) != NULL) {
                item = rb_entry(node, struct ocfs2_meta_cache_item, c_node);
 
-               mlog(0, "Purge item %llu\n",
-                    (unsigned long long) item->c_block);
+               trace_ocfs2_purge_copied_metadata_tree(
+                                       (unsigned long long) item->c_block);
 
                rb_erase(&item->c_node, root);
                kmem_cache_free(ocfs2_uptodate_cachep, item);
@@ -108,19 +168,20 @@ static unsigned int ocfs2_purge_copied_metadata_tree(struct rb_root *root)
  * This function is a few more lines longer than necessary due to some
  * accounting done here, but I think it's worth tracking down those
  * bugs sooner -- Mark */
-void ocfs2_metadata_cache_purge(struct inode *inode)
+void ocfs2_metadata_cache_purge(struct ocfs2_caching_info *ci)
 {
-       struct ocfs2_inode_info *oi = OCFS2_I(inode);
        unsigned int tree, to_purge, purged;
-       struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
        struct rb_root root = RB_ROOT;
 
-       spin_lock(&oi->ip_lock);
-       tree = !(oi->ip_flags & OCFS2_INODE_CACHE_INLINE);
+       BUG_ON(!ci || !ci->ci_ops);
+
+       ocfs2_metadata_cache_lock(ci);
+       tree = !(ci->ci_flags & OCFS2_CACHE_FL_INLINE);
        to_purge = ci->ci_num_cached;
 
-       mlog(0, "Purge %u %s items from Inode %llu\n", to_purge,
-            tree ? "array" : "tree", (unsigned long long)oi->ip_blkno);
+       trace_ocfs2_metadata_cache_purge(
+               (unsigned long long)ocfs2_metadata_cache_owner(ci),
+               to_purge, tree);
 
        /* If we're a tree, save off the root so that we can safely
         * initialize the cache. We do the work to free tree members
@@ -128,16 +189,17 @@ void ocfs2_metadata_cache_purge(struct inode *inode)
        if (tree)
                root = ci->ci_cache.ci_tree;
 
-       ocfs2_metadata_cache_init(inode);
-       spin_unlock(&oi->ip_lock);
+       ocfs2_metadata_cache_reset(ci, 0);
+       ocfs2_metadata_cache_unlock(ci);
 
        purged = ocfs2_purge_copied_metadata_tree(&root);
        /* If possible, track the number wiped so that we can more
         * easily detect counting errors. Unfortunately, this is only
         * meaningful for trees. */
        if (tree && purged != to_purge)
-               mlog(ML_ERROR, "Inode %llu, count = %u, purged = %u\n",
-                    (unsigned long long)oi->ip_blkno, to_purge, purged);
+               mlog(ML_ERROR, "Owner %llu, count = %u, purged = %u\n",
+                    (unsigned long long)ocfs2_metadata_cache_owner(ci),
+                    to_purge, purged);
 }
 
 /* Returns the index in the cache array, -1 if not found.
@@ -178,36 +240,37 @@ ocfs2_search_cache_tree(struct ocfs2_caching_info *ci,
        return NULL;
 }
 
-static int ocfs2_buffer_cached(struct ocfs2_inode_info *oi,
+static int ocfs2_buffer_cached(struct ocfs2_caching_info *ci,
                               struct buffer_head *bh)
 {
        int index = -1;
        struct ocfs2_meta_cache_item *item = NULL;
 
-       spin_lock(&oi->ip_lock);
+       ocfs2_metadata_cache_lock(ci);
 
-       mlog(0, "Inode %llu, query block %llu (inline = %u)\n",
-            (unsigned long long)oi->ip_blkno,
-            (unsigned long long) bh->b_blocknr,
-            !!(oi->ip_flags & OCFS2_INODE_CACHE_INLINE));
+       trace_ocfs2_buffer_cached_begin(
+               (unsigned long long)ocfs2_metadata_cache_owner(ci),
+               (unsigned long long) bh->b_blocknr,
+               !!(ci->ci_flags & OCFS2_CACHE_FL_INLINE));
 
-       if (oi->ip_flags & OCFS2_INODE_CACHE_INLINE)
-               index = ocfs2_search_cache_array(&oi->ip_metadata_cache,
-                                                bh->b_blocknr);
+       if (ci->ci_flags & OCFS2_CACHE_FL_INLINE)
+               index = ocfs2_search_cache_array(ci, bh->b_blocknr);
        else
-               item = ocfs2_search_cache_tree(&oi->ip_metadata_cache,
-                                              bh->b_blocknr);
+               item = ocfs2_search_cache_tree(ci, bh->b_blocknr);
 
-       spin_unlock(&oi->ip_lock);
+       ocfs2_metadata_cache_unlock(ci);
 
-       mlog(0, "index = %d, item = %p\n", index, item);
+       trace_ocfs2_buffer_cached_end(index, item);
 
        return (index != -1) || (item != NULL);
 }
 
 /* Warning: even if it returns true, this does *not* guarantee that
- * the block is stored in our inode metadata cache. */
-int ocfs2_buffer_uptodate(struct inode *inode,
+ * the block is stored in our inode metadata cache.
+ *
+ * This can be called under lock_buffer()
+ */
+int ocfs2_buffer_uptodate(struct ocfs2_caching_info *ci,
                          struct buffer_head *bh)
 {
        /* Doesn't matter if the bh is in our cache or not -- if it's
@@ -223,17 +286,28 @@ int ocfs2_buffer_uptodate(struct inode *inode,
 
        /* Ok, locally the buffer is marked as up to date, now search
         * our cache to see if we can trust that. */
-       return ocfs2_buffer_cached(OCFS2_I(inode), bh);
+       return ocfs2_buffer_cached(ci, bh);
+}
+
+/*
+ * Determine whether a buffer is currently out on a read-ahead request.
+ * ci_io_sem should be held to serialize submitters with the logic here.
+ */
+int ocfs2_buffer_read_ahead(struct ocfs2_caching_info *ci,
+                           struct buffer_head *bh)
+{
+       return buffer_locked(bh) && ocfs2_buffer_cached(ci, bh);
 }
 
 /* Requires ip_lock */
 static void ocfs2_append_cache_array(struct ocfs2_caching_info *ci,
                                     sector_t block)
 {
-       BUG_ON(ci->ci_num_cached >= OCFS2_INODE_MAX_CACHE_ARRAY);
+       BUG_ON(ci->ci_num_cached >= OCFS2_CACHE_INFO_MAX_ARRAY);
 
-       mlog(0, "block %llu takes position %u\n", (unsigned long long) block,
-            ci->ci_num_cached);
+       trace_ocfs2_append_cache_array(
+               (unsigned long long)ocfs2_metadata_cache_owner(ci),
+               (unsigned long long)block, ci->ci_num_cached);
 
        ci->ci_cache.ci_array[ci->ci_num_cached] = block;
        ci->ci_num_cached++;
@@ -250,8 +324,9 @@ static void __ocfs2_insert_cache_tree(struct ocfs2_caching_info *ci,
        struct rb_node **p = &ci->ci_cache.ci_tree.rb_node;
        struct ocfs2_meta_cache_item *tmp;
 
-       mlog(0, "Insert block %llu num = %u\n", (unsigned long long) block,
-            ci->ci_num_cached);
+       trace_ocfs2_insert_cache_tree(
+               (unsigned long long)ocfs2_metadata_cache_owner(ci),
+               (unsigned long long)block, ci->ci_num_cached);
 
        while(*p) {
                parent = *p;
@@ -275,67 +350,65 @@ static void __ocfs2_insert_cache_tree(struct ocfs2_caching_info *ci,
        ci->ci_num_cached++;
 }
 
-static inline int ocfs2_insert_can_use_array(struct ocfs2_inode_info *oi,
-                                            struct ocfs2_caching_info *ci)
+/* co_cache_lock() must be held */
+static inline int ocfs2_insert_can_use_array(struct ocfs2_caching_info *ci)
 {
-       assert_spin_locked(&oi->ip_lock);
-
-       return (oi->ip_flags & OCFS2_INODE_CACHE_INLINE) &&
-               (ci->ci_num_cached < OCFS2_INODE_MAX_CACHE_ARRAY);
+       return (ci->ci_flags & OCFS2_CACHE_FL_INLINE) &&
+               (ci->ci_num_cached < OCFS2_CACHE_INFO_MAX_ARRAY);
 }
 
-/* tree should be exactly OCFS2_INODE_MAX_CACHE_ARRAY wide. NULL the
+/* tree should be exactly OCFS2_CACHE_INFO_MAX_ARRAY wide. NULL the
  * pointers in tree after we use them - this allows caller to detect
- * when to free in case of error. */
-static void ocfs2_expand_cache(struct ocfs2_inode_info *oi,
+ * when to free in case of error.
+ *
+ * The co_cache_lock() must be held. */
+static void ocfs2_expand_cache(struct ocfs2_caching_info *ci,
                               struct ocfs2_meta_cache_item **tree)
 {
        int i;
-       struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
 
-       mlog_bug_on_msg(ci->ci_num_cached != OCFS2_INODE_MAX_CACHE_ARRAY,
-                       "Inode %llu, num cached = %u, should be %u\n",
-                       (unsigned long long)oi->ip_blkno, ci->ci_num_cached,
-                       OCFS2_INODE_MAX_CACHE_ARRAY);
-       mlog_bug_on_msg(!(oi->ip_flags & OCFS2_INODE_CACHE_INLINE),
-                       "Inode %llu not marked as inline anymore!\n",
-                       (unsigned long long)oi->ip_blkno);
-       assert_spin_locked(&oi->ip_lock);
+       mlog_bug_on_msg(ci->ci_num_cached != OCFS2_CACHE_INFO_MAX_ARRAY,
+                       "Owner %llu, num cached = %u, should be %u\n",
+                       (unsigned long long)ocfs2_metadata_cache_owner(ci),
+                       ci->ci_num_cached, OCFS2_CACHE_INFO_MAX_ARRAY);
+       mlog_bug_on_msg(!(ci->ci_flags & OCFS2_CACHE_FL_INLINE),
+                       "Owner %llu not marked as inline anymore!\n",
+                       (unsigned long long)ocfs2_metadata_cache_owner(ci));
 
        /* Be careful to initialize the tree members *first* because
         * once the ci_tree is used, the array is junk... */
-       for(i = 0; i < OCFS2_INODE_MAX_CACHE_ARRAY; i++)
+       for (i = 0; i < OCFS2_CACHE_INFO_MAX_ARRAY; i++)
                tree[i]->c_block = ci->ci_cache.ci_array[i];
 
-       oi->ip_flags &= ~OCFS2_INODE_CACHE_INLINE;
+       ci->ci_flags &= ~OCFS2_CACHE_FL_INLINE;
        ci->ci_cache.ci_tree = RB_ROOT;
        /* this will be set again by __ocfs2_insert_cache_tree */
        ci->ci_num_cached = 0;
 
-       for(i = 0; i < OCFS2_INODE_MAX_CACHE_ARRAY; i++) {
+       for (i = 0; i < OCFS2_CACHE_INFO_MAX_ARRAY; i++) {
                __ocfs2_insert_cache_tree(ci, tree[i]);
                tree[i] = NULL;
        }
 
-       mlog(0, "Expanded %llu to a tree cache: flags 0x%x, num = %u\n",
-            (unsigned long long)oi->ip_blkno, oi->ip_flags, ci->ci_num_cached);
+       trace_ocfs2_expand_cache(
+               (unsigned long long)ocfs2_metadata_cache_owner(ci),
+               ci->ci_flags, ci->ci_num_cached);
 }
 
 /* Slow path function - memory allocation is necessary. See the
  * comment above ocfs2_set_buffer_uptodate for more information. */
-static void __ocfs2_set_buffer_uptodate(struct ocfs2_inode_info *oi,
+static void __ocfs2_set_buffer_uptodate(struct ocfs2_caching_info *ci,
                                        sector_t block,
                                        int expand_tree)
 {
        int i;
-       struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
        struct ocfs2_meta_cache_item *new = NULL;
-       struct ocfs2_meta_cache_item *tree[OCFS2_INODE_MAX_CACHE_ARRAY] =
+       struct ocfs2_meta_cache_item *tree[OCFS2_CACHE_INFO_MAX_ARRAY] =
                { NULL, };
 
-       mlog(0, "Inode %llu, block %llu, expand = %d\n",
-            (unsigned long long)oi->ip_blkno,
-            (unsigned long long)block, expand_tree);
+       trace_ocfs2_set_buffer_uptodate(
+               (unsigned long long)ocfs2_metadata_cache_owner(ci),
+               (unsigned long long)block, expand_tree);
 
        new = kmem_cache_alloc(ocfs2_uptodate_cachep, GFP_NOFS);
        if (!new) {
@@ -347,7 +420,7 @@ static void __ocfs2_set_buffer_uptodate(struct ocfs2_inode_info *oi,
        if (expand_tree) {
                /* Do *not* allocate an array here - the removal code
                 * has no way of tracking that. */
-               for(i = 0; i < OCFS2_INODE_MAX_CACHE_ARRAY; i++) {
+               for (i = 0; i < OCFS2_CACHE_INFO_MAX_ARRAY; i++) {
                        tree[i] = kmem_cache_alloc(ocfs2_uptodate_cachep,
                                                   GFP_NOFS);
                        if (!tree[i]) {
@@ -359,21 +432,20 @@ static void __ocfs2_set_buffer_uptodate(struct ocfs2_inode_info *oi,
                }
        }
 
-       spin_lock(&oi->ip_lock);
-       if (ocfs2_insert_can_use_array(oi, ci)) {
-               mlog(0, "Someone cleared the tree underneath us\n");
+       ocfs2_metadata_cache_lock(ci);
+       if (ocfs2_insert_can_use_array(ci)) {
                /* Ok, items were removed from the cache in between
                 * locks. Detect this and revert back to the fast path */
                ocfs2_append_cache_array(ci, block);
-               spin_unlock(&oi->ip_lock);
+               ocfs2_metadata_cache_unlock(ci);
                goto out_free;
        }
 
        if (expand_tree)
-               ocfs2_expand_cache(oi, tree);
+               ocfs2_expand_cache(ci, tree);
 
        __ocfs2_insert_cache_tree(ci, new);
-       spin_unlock(&oi->ip_lock);
+       ocfs2_metadata_cache_unlock(ci);
 
        new = NULL;
 out_free:
@@ -383,14 +455,14 @@ out_free:
        /* If these were used, then ocfs2_expand_cache re-set them to
         * NULL for us. */
        if (tree[0]) {
-               for(i = 0; i < OCFS2_INODE_MAX_CACHE_ARRAY; i++)
+               for (i = 0; i < OCFS2_CACHE_INFO_MAX_ARRAY; i++)
                        if (tree[i])
                                kmem_cache_free(ocfs2_uptodate_cachep,
                                                tree[i]);
        }
 }
 
-/* Item insertion is guarded by ip_io_mutex, so the insertion path takes
+/* Item insertion is guarded by co_io_lock(), so the insertion path takes
  * advantage of this by not rechecking for a duplicate insert during
  * the slow case. Additionally, if the cache needs to be bumped up to
  * a tree, the code will not recheck after acquiring the lock --
@@ -403,60 +475,60 @@ out_free:
  *
  * Note that this function may actually fail to insert the block if
  * memory cannot be allocated. This is not fatal however (but may
- * result in a performance penalty) */
-void ocfs2_set_buffer_uptodate(struct inode *inode,
+ * result in a performance penalty)
+ *
+ * Readahead buffers can be passed in here before the I/O request is
+ * completed.
+ */
+void ocfs2_set_buffer_uptodate(struct ocfs2_caching_info *ci,
                               struct buffer_head *bh)
 {
        int expand;
-       struct ocfs2_inode_info *oi = OCFS2_I(inode);
-       struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
 
        /* The block may very well exist in our cache already, so avoid
         * doing any more work in that case. */
-       if (ocfs2_buffer_cached(oi, bh))
+       if (ocfs2_buffer_cached(ci, bh))
                return;
 
-       mlog(0, "Inode %llu, inserting block %llu\n",
-            (unsigned long long)oi->ip_blkno,
-            (unsigned long long)bh->b_blocknr);
+       trace_ocfs2_set_buffer_uptodate_begin(
+               (unsigned long long)ocfs2_metadata_cache_owner(ci),
+               (unsigned long long)bh->b_blocknr);
 
        /* No need to recheck under spinlock - insertion is guarded by
-        * ip_io_mutex */
-       spin_lock(&oi->ip_lock);
-       if (ocfs2_insert_can_use_array(oi, ci)) {
+        * co_io_lock() */
+       ocfs2_metadata_cache_lock(ci);
+       if (ocfs2_insert_can_use_array(ci)) {
                /* Fast case - it's an array and there's a free
                 * spot. */
                ocfs2_append_cache_array(ci, bh->b_blocknr);
-               spin_unlock(&oi->ip_lock);
+               ocfs2_metadata_cache_unlock(ci);
                return;
        }
 
        expand = 0;
-       if (oi->ip_flags & OCFS2_INODE_CACHE_INLINE) {
+       if (ci->ci_flags & OCFS2_CACHE_FL_INLINE) {
                /* We need to bump things up to a tree. */
                expand = 1;
        }
-       spin_unlock(&oi->ip_lock);
+       ocfs2_metadata_cache_unlock(ci);
 
-       __ocfs2_set_buffer_uptodate(oi, bh->b_blocknr, expand);
+       __ocfs2_set_buffer_uptodate(ci, bh->b_blocknr, expand);
 }
 
 /* Called against a newly allocated buffer. Most likely nobody should
  * be able to read this sort of metadata while it's still being
- * allocated, but this is careful to take ip_io_mutex anyway. */
-void ocfs2_set_new_buffer_uptodate(struct inode *inode,
+ * allocated, but this is careful to take co_io_lock() anyway. */
+void ocfs2_set_new_buffer_uptodate(struct ocfs2_caching_info *ci,
                                   struct buffer_head *bh)
 {
-       struct ocfs2_inode_info *oi = OCFS2_I(inode);
-
        /* This should definitely *not* exist in our cache */
-       BUG_ON(ocfs2_buffer_cached(oi, bh));
+       BUG_ON(ocfs2_buffer_cached(ci, bh));
 
        set_buffer_uptodate(bh);
 
-       mutex_lock(&oi->ip_io_mutex);
-       ocfs2_set_buffer_uptodate(inode, bh);
-       mutex_unlock(&oi->ip_io_mutex);
+       ocfs2_metadata_cache_io_lock(ci);
+       ocfs2_set_buffer_uptodate(ci, bh);
+       ocfs2_metadata_cache_io_unlock(ci);
 }
 
 /* Requires ip_lock. */
@@ -466,12 +538,13 @@ static void ocfs2_remove_metadata_array(struct ocfs2_caching_info *ci,
        sector_t *array = ci->ci_cache.ci_array;
        int bytes;
 
-       BUG_ON(index < 0 || index >= OCFS2_INODE_MAX_CACHE_ARRAY);
+       BUG_ON(index < 0 || index >= OCFS2_CACHE_INFO_MAX_ARRAY);
        BUG_ON(index >= ci->ci_num_cached);
        BUG_ON(!ci->ci_num_cached);
 
-       mlog(0, "remove index %d (num_cached = %u\n", index,
-            ci->ci_num_cached);
+       trace_ocfs2_remove_metadata_array(
+               (unsigned long long)ocfs2_metadata_cache_owner(ci),
+               index, ci->ci_num_cached);
 
        ci->ci_num_cached--;
 
@@ -487,32 +560,27 @@ static void ocfs2_remove_metadata_array(struct ocfs2_caching_info *ci,
 static void ocfs2_remove_metadata_tree(struct ocfs2_caching_info *ci,
                                       struct ocfs2_meta_cache_item *item)
 {
-       mlog(0, "remove block %llu from tree\n",
-            (unsigned long long) item->c_block);
+       trace_ocfs2_remove_metadata_tree(
+               (unsigned long long)ocfs2_metadata_cache_owner(ci),
+               (unsigned long long)item->c_block);
 
        rb_erase(&item->c_node, &ci->ci_cache.ci_tree);
        ci->ci_num_cached--;
 }
 
-/* Called when we remove a chunk of metadata from an inode. We don't
- * bother reverting things to an inlined array in the case of a remove
- * which moves us back under the limit. */
-void ocfs2_remove_from_cache(struct inode *inode,
-                            struct buffer_head *bh)
+static void ocfs2_remove_block_from_cache(struct ocfs2_caching_info *ci,
+                                         sector_t block)
 {
        int index;
-       sector_t block = bh->b_blocknr;
        struct ocfs2_meta_cache_item *item = NULL;
-       struct ocfs2_inode_info *oi = OCFS2_I(inode);
-       struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
 
-       spin_lock(&oi->ip_lock);
-       mlog(0, "Inode %llu, remove %llu, items = %u, array = %u\n",
-            (unsigned long long)oi->ip_blkno,
-            (unsigned long long) block, ci->ci_num_cached,
-            oi->ip_flags & OCFS2_INODE_CACHE_INLINE);
+       ocfs2_metadata_cache_lock(ci);
+       trace_ocfs2_remove_block_from_cache(
+               (unsigned long long)ocfs2_metadata_cache_owner(ci),
+               (unsigned long long) block, ci->ci_num_cached,
+               ci->ci_flags);
 
-       if (oi->ip_flags & OCFS2_INODE_CACHE_INLINE) {
+       if (ci->ci_flags & OCFS2_CACHE_FL_INLINE) {
                index = ocfs2_search_cache_array(ci, block);
                if (index != -1)
                        ocfs2_remove_metadata_array(ci, index);
@@ -521,23 +589,45 @@ void ocfs2_remove_from_cache(struct inode *inode,
                if (item)
                        ocfs2_remove_metadata_tree(ci, item);
        }
-       spin_unlock(&oi->ip_lock);
+       ocfs2_metadata_cache_unlock(ci);
 
        if (item)
                kmem_cache_free(ocfs2_uptodate_cachep, item);
 }
 
+/*
+ * Called when we remove a chunk of metadata from an inode. We don't
+ * bother reverting things to an inlined array in the case of a remove
+ * which moves us back under the limit.
+ */
+void ocfs2_remove_from_cache(struct ocfs2_caching_info *ci,
+                            struct buffer_head *bh)
+{
+       sector_t block = bh->b_blocknr;
+
+       ocfs2_remove_block_from_cache(ci, block);
+}
+
+/* Called when we remove xattr clusters from an inode. */
+void ocfs2_remove_xattr_clusters_from_cache(struct ocfs2_caching_info *ci,
+                                           sector_t block,
+                                           u32 c_len)
+{
+       struct super_block *sb = ocfs2_metadata_cache_get_super(ci);
+       unsigned int i, b_len = ocfs2_clusters_to_blocks(sb, 1) * c_len;
+
+       for (i = 0; i < b_len; i++, block++)
+               ocfs2_remove_block_from_cache(ci, block);
+}
+
 int __init init_ocfs2_uptodate_cache(void)
 {
        ocfs2_uptodate_cachep = kmem_cache_create("ocfs2_uptodate",
                                  sizeof(struct ocfs2_meta_cache_item),
-                                 0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                 0, SLAB_HWCACHE_ALIGN, NULL);
        if (!ocfs2_uptodate_cachep)
                return -ENOMEM;
 
-       mlog(0, "%u inlined cache items per inode.\n",
-            OCFS2_INODE_MAX_CACHE_ARRAY);
-
        return 0;
 }