ocfs2: Make the ocfs2_caching_info structure self-contained.

We want to use the ocfs2_caching_info structure in places that are not
inodes.  To do that, it can no longer rely on referencing the inode
directly.

This patch moves the flags to ocfs2_caching_info->ci_flags, stores
pointers to the parent's locks on the ocfs2_caching_info, and renames
the constants and flags to reflect its independant state.

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

1 files changed, 3 insertions, 2 deletions

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 4dc8890ba316..8ec80445d18c 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -1118,7 +1118,8 @@ void ocfs2_clear_inode(struct inode *inode)
                         "Clear inode of %llu, inode has %u cache items\n",
                         (unsigned long long)oi->ip_blkno, oi->ip_metadata_cache.ci_num_cached);
 
-        mlog_bug_on_msg(!(oi->ip_flags & OCFS2_INODE_CACHE_INLINE),
+        mlog_bug_on_msg(!(oi->ip_metadata_cache.ci_flags &
+                          OCFS2_CACHE_FL_INLINE),
                         "Clear inode of %llu, inode has a bad flag\n",
                         (unsigned long long)oi->ip_blkno);
 
@@ -1145,7 +1146,7 @@ void ocfs2_clear_inode(struct inode *inode)
                         (unsigned long long)oi->ip_blkno, oi->ip_open_count);
 
         /* Clear all other flags. */
-        oi->ip_flags = OCFS2_INODE_CACHE_INLINE;
+        oi->ip_flags = 0;
         oi->ip_created_trans = 0;
         oi->ip_last_trans = 0;
         oi->ip_dir_start_lookup = 0;