ocfs2: Pass struct ocfs2_caching_info to the journal functions.

The next step in divorcing metadata I/O management from struct inode is
to pass struct ocfs2_caching_info to the journal functions.  Thus the
journal locks a metadata cache with the cache io_lock function.  It also
can compare ci_last_trans and ci_created_trans directly.

This is a large patch because of all the places we change
ocfs2_journal_access..(handle, inode, ...) to
ocfs2_journal_access..(handle, INODE_CACHE(inode), ...).

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

1 files changed, 12 insertions, 8 deletions

diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
index 3df2954ac83b..1a2c50a759fa 100644
--- a/fs/ocfs2/quota_local.c
+++ b/fs/ocfs2/quota_local.c
@@ -108,7 +108,7 @@ static int ocfs2_modify_bh(struct inode *inode, struct buffer_head *bh,
                 mlog_errno(status);
                 return status;
         }
-        status = ocfs2_journal_access_dq(handle, inode, bh,
+        status = ocfs2_journal_access_dq(handle, INODE_CACHE(inode), bh,
                                          OCFS2_JOURNAL_ACCESS_WRITE);
         if (status < 0) {
                 mlog_errno(status);
@@ -510,7 +510,8 @@ static int ocfs2_recover_local_quota_file(struct inode *lqinode,
                                 goto out_commit;
                         }
                         /* Release local quota file entry */
-                        status = ocfs2_journal_access_dq(handle, lqinode,
+                        status = ocfs2_journal_access_dq(handle,
+                                        INODE_CACHE(lqinode),
                                         qbh, OCFS2_JOURNAL_ACCESS_WRITE);
                         if (status < 0) {
                                 mlog_errno(status);
@@ -619,7 +620,8 @@ int ocfs2_finish_quota_recovery(struct ocfs2_super *osb,
                         mlog_errno(status);
                         goto out_bh;
                 }
-                status = ocfs2_journal_access_dq(handle, lqinode, bh,
+                status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode),
+                                                 bh,
                                                  OCFS2_JOURNAL_ACCESS_WRITE);
                 if (status < 0) {
                         mlog_errno(status);
@@ -994,7 +996,7 @@ static struct ocfs2_quota_chunk *ocfs2_local_quota_add_chunk(
         }
         dchunk = (struct ocfs2_local_disk_chunk *)bh->b_data;
         ocfs2_set_new_buffer_uptodate(INODE_CACHE(lqinode), bh);
-        status = ocfs2_journal_access_dq(handle, lqinode, bh,
+        status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode), bh,
                                          OCFS2_JOURNAL_ACCESS_CREATE);
         if (status < 0) {
                 mlog_errno(status);
@@ -1028,7 +1030,7 @@ static struct ocfs2_quota_chunk *ocfs2_local_quota_add_chunk(
                 goto out_trans;
         }
         ocfs2_set_new_buffer_uptodate(INODE_CACHE(lqinode), dbh);
-        status = ocfs2_journal_access_dq(handle, lqinode, dbh,
+        status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode), dbh,
                                          OCFS2_JOURNAL_ACCESS_CREATE);
         if (status < 0) {
                 mlog_errno(status);
@@ -1143,7 +1145,7 @@ static struct ocfs2_quota_chunk *ocfs2_extend_local_quota_file(
                 goto out;
         }
         /* Zero created block */
-        status = ocfs2_journal_access_dq(handle, lqinode, bh,
+        status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode), bh,
                                  OCFS2_JOURNAL_ACCESS_CREATE);
         if (status < 0) {
                 mlog_errno(status);
@@ -1158,7 +1160,8 @@ static struct ocfs2_quota_chunk *ocfs2_extend_local_quota_file(
                 goto out_trans;
         }
         /* Update chunk header */
-        status = ocfs2_journal_access_dq(handle, lqinode, chunk->qc_headerbh,
+        status = ocfs2_journal_access_dq(handle, INODE_CACHE(lqinode),
+                                         chunk->qc_headerbh,
                                  OCFS2_JOURNAL_ACCESS_WRITE);
         if (status < 0) {
                 mlog_errno(status);
@@ -1292,7 +1295,8 @@ static int ocfs2_local_release_dquot(struct dquot *dquot)
                 goto out;
         }
 
-        status = ocfs2_journal_access_dq(handle, sb_dqopt(sb)->files[type],
+        status = ocfs2_journal_access_dq(handle,
+                        INODE_CACHE(sb_dqopt(sb)->files[type]),
                         od->dq_chunk->qc_headerbh, OCFS2_JOURNAL_ACCESS_WRITE);
         if (status < 0) {
                 mlog_errno(status);