GFS2: Copy gfs2_trans_add_bh into new data/meta functions

[platform/adaptation/renesas_rcar/renesas_kernel.git] / fs / gfs2 / lops.c

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 9c80742..a505597 100644 (file)
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -37,7 +37,7 @@
  *
  * The log lock must be held when calling this function
  */
-static void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh)
+void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh)
 {
        struct gfs2_bufdata *bd;
 
@@ -388,32 +388,6 @@ static struct page *gfs2_get_log_desc(struct gfs2_sbd *sdp, u32 ld_type,
        return page;
 }
 
-static void buf_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
-{
-       struct gfs2_meta_header *mh;
-       struct gfs2_trans *tr;
-
-       tr = current->journal_info;
-       tr->tr_touched = 1;
-       if (!list_empty(&bd->bd_list))
-               return;
-       set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
-       set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);
-       mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;
-       if (unlikely(mh->mh_magic != cpu_to_be32(GFS2_MAGIC))) {
-               printk(KERN_ERR
-                      "Attempting to add uninitialised block to journal (inplace block=%lld)\n",
-                      (unsigned long long)bd->bd_bh->b_blocknr);
-               BUG();
-       }
-       gfs2_pin(sdp, bd->bd_bh);
-       mh->__pad0 = cpu_to_be64(0);
-       mh->mh_jid = cpu_to_be32(sdp->sd_jdesc->jd_jid);
-       sdp->sd_log_num_buf++;
-       list_add(&bd->bd_list, &sdp->sd_log_le_buf);
-       tr->tr_num_buf_new++;
-}
-
 static void gfs2_check_magic(struct buffer_head *bh)
 {
        void *kaddr;
@@ -735,44 +709,6 @@ static void revoke_lo_after_scan(struct gfs2_jdesc *jd, int error, int pass)
 }
 
 /**
- * databuf_lo_add - Add a databuf to the transaction.
- *
- * This is used in two distinct cases:
- * i) In ordered write mode
- *    We put the data buffer on a list so that we can ensure that its
- *    synced to disk at the right time
- * ii) In journaled data mode
- *    We need to journal the data block in the same way as metadata in
- *    the functions above. The difference is that here we have a tag
- *    which is two __be64's being the block number (as per meta data)
- *    and a flag which says whether the data block needs escaping or
- *    not. This means we need a new log entry for each 251 or so data
- *    blocks, which isn't an enormous overhead but twice as much as
- *    for normal metadata blocks.
- */
-static void databuf_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
-{
-       struct gfs2_trans *tr = current->journal_info;
-       struct address_space *mapping = bd->bd_bh->b_page->mapping;
-       struct gfs2_inode *ip = GFS2_I(mapping->host);
-
-       if (tr)
-               tr->tr_touched = 1;
-       if (!list_empty(&bd->bd_list))
-               return;
-       set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
-       set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);
-       if (gfs2_is_jdata(ip)) {
-               gfs2_pin(sdp, bd->bd_bh);
-               tr->tr_num_databuf_new++;
-               sdp->sd_log_num_databuf++;
-               list_add_tail(&bd->bd_list, &sdp->sd_log_le_databuf);
-       } else {
-               list_add_tail(&bd->bd_list, &sdp->sd_log_le_ordered);
-       }
-}
-
-/**
  * databuf_lo_before_commit - Scan the data buffers, writing as we go
  *
  */
@@ -871,7 +807,6 @@ static void databuf_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_ail *ai)
 
 
 const struct gfs2_log_operations gfs2_buf_lops = {
-       .lo_add = buf_lo_add,
        .lo_before_commit = buf_lo_before_commit,
        .lo_after_commit = buf_lo_after_commit,
        .lo_before_scan = buf_lo_before_scan,
@@ -894,7 +829,6 @@ const struct gfs2_log_operations gfs2_rg_lops = {
 };
 
 const struct gfs2_log_operations gfs2_databuf_lops = {
-       .lo_add = databuf_lo_add,
        .lo_before_commit = databuf_lo_before_commit,
        .lo_after_commit = databuf_lo_after_commit,
        .lo_scan_elements = databuf_lo_scan_elements,