ocfs2: pass ocfs2_super * into ocfs2_commit_trans()

This sets us up to remove handle->journal.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>

11 files changed, 31 insertions, 29 deletions

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 22dd60833c9b..f3dbd31a85a1 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -1170,7 +1170,7 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb)
         if (status < 0)
                 mlog_errno(status);
 
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(osb, handle);
 
 out_unlock:
         brelse(data_alloc_bh);
@@ -1379,7 +1379,7 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb,
 
                 status = ocfs2_truncate_log_append(osb, handle,
                                                    start_blk, clusters);
-                ocfs2_commit_trans(handle);
+                ocfs2_commit_trans(osb, handle);
                 if (status < 0) {
                         mlog_errno(status);
                         goto bail_up;
@@ -1883,7 +1883,7 @@ start:
         mutex_unlock(&tl_inode->i_mutex);
         tl_sem = 0;
 
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(osb, handle);
         handle = NULL;
 
         BUG_ON(le32_to_cpu(fe->i_clusters) < target_i_clusters);
@@ -1898,7 +1898,7 @@ bail:
                 mutex_unlock(&tl_inode->i_mutex);
 
         if (handle)
-                ocfs2_commit_trans(handle);
+                ocfs2_commit_trans(osb, handle);
 
         if (last_eb_bh)
                 brelse(last_eb_bh);
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 196a71cb9764..c36939996946 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -382,7 +382,7 @@ struct ocfs2_journal_handle *ocfs2_start_walk_page_trans(struct inode *inode,
 out:
         if (ret) {
                 if (handle)
-                        ocfs2_commit_trans(handle);
+                        ocfs2_commit_trans(osb, handle);
                 handle = ERR_PTR(ret);
         }
         return handle;
@@ -464,7 +464,7 @@ static int ocfs2_commit_write(struct file *file, struct page *page,
         }
 
 out_commit:
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
 out_unlock_data:
         ocfs2_data_unlock(inode, 1);
 out_unlock_meta:
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index db46ee505782..2bda5f345216 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -488,7 +488,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
         get_bh(*new_de_bh);
 bail:
         if (handle)
-                ocfs2_commit_trans(handle);
+                ocfs2_commit_trans(osb, handle);
 
         if (data_ac)
                 ocfs2_free_alloc_context(data_ac);
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index bcae2693e957..9eb60f21968d 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -178,7 +178,7 @@ static int ocfs2_simple_size_update(struct inode *inode,
         if (ret < 0)
                 mlog_errno(ret);
 
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(osb, handle);
 out:
         return ret;
 }
@@ -207,7 +207,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
         if (status < 0)
                 mlog_errno(status);
 
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(osb, handle);
 out:
         mlog_exit(status);
         return status;
@@ -576,7 +576,7 @@ leave:
                 drop_alloc_sem = 0;
         }
         if (handle) {
-                ocfs2_commit_trans(handle);
+                ocfs2_commit_trans(osb, handle);
                 handle = NULL;
         }
         if (data_ac) {
@@ -655,7 +655,7 @@ static int ocfs2_write_zero_page(struct inode *inode,
                 ret = 0;
 
         if (handle)
-                ocfs2_commit_trans(handle);
+                ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
 out_unlock:
         unlock_page(page);
         page_cache_release(page);
@@ -850,7 +850,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
                 mlog_errno(status);
 
 bail_commit:
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(osb, handle);
 bail_unlock:
         ocfs2_meta_unlock(inode, 1);
 bail_unlock_rw:
@@ -938,7 +938,7 @@ static int ocfs2_write_remove_suid(struct inode *inode)
 out_bh:
         brelse(bh);
 out_trans:
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(osb, handle);
 out:
         mlog_exit(ret);
         return ret;
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index dec0ece6267a..7708c63a3554 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -538,7 +538,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
                 goto bail;
         }
 
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(osb, handle);
         handle = NULL;
 
         status = ocfs2_prepare_truncate(osb, inode, fe_bh, &tc);
@@ -554,7 +554,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
         }
 bail:
         if (handle)
-                ocfs2_commit_trans(handle);
+                ocfs2_commit_trans(osb, handle);
 
         mlog_exit(status);
         return status;
@@ -629,7 +629,7 @@ static int ocfs2_remove_inode(struct inode *inode,
                 mlog_errno(status);
 
 bail_commit:
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(osb, handle);
 bail_unlock:
         ocfs2_meta_unlock(inode_alloc_inode, 1);
         mutex_unlock(&inode_alloc_inode->i_mutex);
diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c
index 16d8861b281f..e927758e8cd3 100644
--- a/fs/ocfs2/ioctl.c
+++ b/fs/ocfs2/ioctl.c
@@ -96,7 +96,7 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
         if (status < 0)
                 mlog_errno(status);
 
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(osb, handle);
 bail_unlock:
         ocfs2_meta_unlock(inode, 1);
 bail:
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 61db8e7fffa5..00402e749fc6 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -195,11 +195,12 @@ done_free:
         return ERR_PTR(ret);
 }
 
-void ocfs2_commit_trans(struct ocfs2_journal_handle *handle)
+void ocfs2_commit_trans(struct ocfs2_super *osb,
+                        struct ocfs2_journal_handle *handle)
 {
         handle_t *jbd_handle;
         int retval;
-        struct ocfs2_journal *journal = handle->journal;
+        struct ocfs2_journal *journal = osb->journal;
 
         mlog_entry_void();
 
diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h
index 3e64e6b646a9..d315179d0c07 100644
--- a/fs/ocfs2/journal.h
+++ b/fs/ocfs2/journal.h
@@ -219,7 +219,8 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode)
 struct ocfs2_journal_handle *ocfs2_start_trans(struct ocfs2_super *osb,
                                                struct ocfs2_journal_handle *handle,
                                                int max_buffs);
-void                         ocfs2_commit_trans(struct ocfs2_journal_handle *handle);
+void                         ocfs2_commit_trans(struct ocfs2_super *osb,
+                                                struct ocfs2_journal_handle *handle);
 int                          ocfs2_extend_trans(handle_t *handle, int nblocks);
 
 /*
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
index 4c46c0a81e00..9dd208dc5d7a 100644
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
@@ -280,7 +280,7 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb)
                 mlog_errno(status);
 
 out_commit:
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(osb, handle);
 
 out_unlock:
         if (main_bm_bh)
@@ -421,7 +421,7 @@ int ocfs2_complete_local_alloc_recovery(struct ocfs2_super *osb,
         if (status < 0)
                 mlog_errno(status);
 
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(osb, handle);
 
 out_unlock:
         ocfs2_meta_unlock(main_bm_inode, 1);
@@ -954,7 +954,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
         status = 0;
 bail:
         if (handle)
-                ocfs2_commit_trans(handle);
+                ocfs2_commit_trans(osb, handle);
 
         if (main_bm_bh)
                 brelse(main_bm_bh);
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index daf70605afa8..9a56bfdf45c6 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -440,7 +440,7 @@ static int ocfs2_mknod(struct inode *dir,
         status = 0;
 leave:
         if (handle)
-                ocfs2_commit_trans(handle);
+                ocfs2_commit_trans(osb, handle);
 
         ocfs2_meta_unlock(dir, 1);
 
@@ -746,7 +746,7 @@ static int ocfs2_link(struct dentry *old_dentry,
         d_instantiate(dentry, inode);
 
 out_commit:
-        ocfs2_commit_trans(handle);
+        ocfs2_commit_trans(osb, handle);
 out_unlock_inode:
         ocfs2_meta_unlock(inode, 1);
 
@@ -942,7 +942,7 @@ static int ocfs2_unlink(struct inode *dir,
 
 leave:
         if (handle)
-                ocfs2_commit_trans(handle);
+                ocfs2_commit_trans(osb, handle);
 
         if (child_locked)
                 ocfs2_meta_unlock(inode, 1);
@@ -1428,7 +1428,7 @@ bail:
                 ocfs2_rename_unlock(osb);
 
         if (handle)
-                ocfs2_commit_trans(handle);
+                ocfs2_commit_trans(osb, handle);
 
         if (parents_locked)
                 ocfs2_double_unlock(old_dir, new_dir);
@@ -1730,7 +1730,7 @@ static int ocfs2_symlink(struct inode *dir,
         d_instantiate(dentry, inode);
 bail:
         if (handle)
-                ocfs2_commit_trans(handle);
+                ocfs2_commit_trans(osb, handle);
 
         ocfs2_meta_unlock(dir, 1);
 
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index 27f8dc4c819c..ea63a519167d 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -387,7 +387,7 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
         status = 0;
 bail:
         if (handle)
-                ocfs2_commit_trans(handle);
+                ocfs2_commit_trans(osb, handle);
 
         if (ac)
                 ocfs2_free_alloc_context(ac);