ocfs2: Change metadata caching locks to an operations structure.

We don't really want to cart around too many new fields on the
ocfs2_caching_info structure.  So let's wrap all our access of the
parent object in a set of operations.  One pointer on caching_info, and
more flexibility to boot.

Signed-off-by: Joel Becker <joel.becker@oracle.com>

1 files changed, 49 insertions, 0 deletions

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 8ec80445d18c..36bb588f8fcb 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -1395,3 +1395,52 @@ int ocfs2_read_inode_block(struct inode *inode, struct buffer_head **bh)
 {
         return ocfs2_read_inode_block_full(inode, bh, 0);
 }
+
+static struct ocfs2_inode_info *cache_info_to_inode(struct ocfs2_caching_info *ci)
+{
+        return container_of(ci, struct ocfs2_inode_info, ip_metadata_cache);
+}
+
+static u64 ocfs2_inode_cache_owner(struct ocfs2_caching_info *ci)
+{
+        struct ocfs2_inode_info *oi = cache_info_to_inode(ci);
+
+        return oi->ip_blkno;
+}
+
+static void ocfs2_inode_cache_lock(struct ocfs2_caching_info *ci)
+{
+        struct ocfs2_inode_info *oi = cache_info_to_inode(ci);
+
+        spin_lock(&oi->ip_lock);
+}
+
+static void ocfs2_inode_cache_unlock(struct ocfs2_caching_info *ci)
+{
+        struct ocfs2_inode_info *oi = cache_info_to_inode(ci);
+
+        spin_unlock(&oi->ip_lock);
+}
+
+static void ocfs2_inode_cache_io_lock(struct ocfs2_caching_info *ci)
+{
+        struct ocfs2_inode_info *oi = cache_info_to_inode(ci);
+
+        mutex_lock(&oi->ip_io_mutex);
+}
+
+static void ocfs2_inode_cache_io_unlock(struct ocfs2_caching_info *ci)
+{
+        struct ocfs2_inode_info *oi = cache_info_to_inode(ci);
+
+        mutex_unlock(&oi->ip_io_mutex);
+}
+
+const struct ocfs2_caching_operations ocfs2_inode_caching_ops = {
+        .co_owner               = ocfs2_inode_cache_owner,
+        .co_cache_lock          = ocfs2_inode_cache_lock,
+        .co_cache_unlock        = ocfs2_inode_cache_unlock,
+        .co_io_lock             = ocfs2_inode_cache_io_lock,
+        .co_io_unlock           = ocfs2_inode_cache_io_unlock,
+};
+