[GFS2] Move some code inside the log lock

[linux-2.6-omap-h63xx.git] / fs / gfs2 / lops.c

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index f82d84d05d233d99806b21c3eb93550759ddbac5..a0371f835cfb314dcfdd42a809294cfc9ebf2b9b 100644 (file)
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -17,6 +17,7 @@
 
 #include "gfs2.h"
 #include "incore.h"
+#include "inode.h"
 #include "glock.h"
 #include "log.h"
 #include "lops.h"
@@ -116,25 +117,26 @@ static void buf_lo_before_commit(struct gfs2_sbd *sdp)
        struct buffer_head *bh;
        struct gfs2_log_descriptor *ld;
        struct gfs2_bufdata *bd1 = NULL, *bd2;
-       unsigned int total = sdp->sd_log_num_buf;
-       unsigned int offset = sizeof(struct gfs2_log_descriptor);
+       unsigned int total;
+       unsigned int offset = BUF_OFFSET;
        unsigned int limit;
        unsigned int num;
        unsigned n;
        __be64 *ptr;
 
-       offset += sizeof(__be64) - 1;
-       offset &= ~(sizeof(__be64) - 1);
-       limit = (sdp->sd_sb.sb_bsize - offset)/sizeof(__be64);
+       limit = buf_limit(sdp);
        /* for 4k blocks, limit = 503 */
 
+       gfs2_log_lock(sdp);
+       total = sdp->sd_log_num_buf;
        bd1 = bd2 = list_prepare_entry(bd1, &sdp->sd_log_le_buf, bd_le.le_list);
        while(total) {
                num = total;
                if (total > limit)
                        num = limit;
+               gfs2_log_unlock(sdp);
                bh = gfs2_log_get_buf(sdp);
-               sdp->sd_log_num_hdrs++;
+               gfs2_log_lock(sdp);
                ld = (struct gfs2_log_descriptor *)bh->b_data;
                ptr = (__be64 *)(bh->b_data + offset);
                ld->ld_header.mh_magic = cpu_to_be32(GFS2_MAGIC);
@@ -154,21 +156,27 @@ static void buf_lo_before_commit(struct gfs2_sbd *sdp)
                                break;
                }
 
+               gfs2_log_unlock(sdp);
                set_buffer_dirty(bh);
                ll_rw_block(WRITE, 1, &bh);
+               gfs2_log_lock(sdp);
 
                n = 0;
                list_for_each_entry_continue(bd2, &sdp->sd_log_le_buf,
                                             bd_le.le_list) {
+                       gfs2_log_unlock(sdp);
                        bh = gfs2_log_fake_buf(sdp, bd2->bd_bh);
                        set_buffer_dirty(bh);
                        ll_rw_block(WRITE, 1, &bh);
+                       gfs2_log_lock(sdp);
                        if (++n >= num)
                                break;
                }
 
+               BUG_ON(total < num);
                total -= num;
        }
+       gfs2_log_unlock(sdp);
 }
 
 static void buf_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_ail *ai)
@@ -469,25 +477,28 @@ static void databuf_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le)
        struct gfs2_inode *ip = GFS2_I(mapping->host);
 
        gfs2_log_lock(sdp);
+       if (!list_empty(&bd->bd_list_tr)) {
+               gfs2_log_unlock(sdp);
+               return;
+       }
        tr->tr_touched = 1;
-       if (list_empty(&bd->bd_list_tr) &&
-           (ip->i_di.di_flags & GFS2_DIF_JDATA)) {
+       if (gfs2_is_jdata(ip)) {
                tr->tr_num_buf++;
                list_add(&bd->bd_list_tr, &tr->tr_list_buf);
-               gfs2_log_unlock(sdp);
-               gfs2_pin(sdp, bd->bd_bh);
-               tr->tr_num_buf_new++;
-       } else {
-               gfs2_log_unlock(sdp);
        }
+       gfs2_log_unlock(sdp);
+       if (!list_empty(&le->le_list))
+               return;
+
        gfs2_trans_add_gl(bd->bd_gl);
-       gfs2_log_lock(sdp);
-       if (list_empty(&le->le_list)) {
-               if (ip->i_di.di_flags & GFS2_DIF_JDATA)
-                       sdp->sd_log_num_jdata++;
-               sdp->sd_log_num_databuf++;
-               list_add(&le->le_list, &sdp->sd_log_le_databuf);
+       if (gfs2_is_jdata(ip)) {
+               sdp->sd_log_num_jdata++;
+               gfs2_pin(sdp, bd->bd_bh);
+               tr->tr_num_databuf_new++;
        }
+       gfs2_log_lock(sdp);
+       sdp->sd_log_num_databuf++;
+       list_add(&le->le_list, &sdp->sd_log_le_databuf);
        gfs2_log_unlock(sdp);
 }
 
@@ -520,23 +531,22 @@ static void databuf_lo_before_commit(struct gfs2_sbd *sdp)
        LIST_HEAD(started);
        struct gfs2_bufdata *bd1 = NULL, *bd2, *bdt;
        struct buffer_head *bh = NULL,*bh1 = NULL;
-       unsigned int offset = sizeof(struct gfs2_log_descriptor);
        struct gfs2_log_descriptor *ld;
        unsigned int limit;
-       unsigned int total_dbuf = sdp->sd_log_num_databuf;
-       unsigned int total_jdata = sdp->sd_log_num_jdata;
+       unsigned int total_dbuf;
+       unsigned int total_jdata;
        unsigned int num, n;
        __be64 *ptr = NULL;
 
-       offset += 2*sizeof(__be64) - 1;
-       offset &= ~(2*sizeof(__be64) - 1);
-       limit = (sdp->sd_sb.sb_bsize - offset)/sizeof(__be64);
+       limit = databuf_limit(sdp);
 
        /*
         * Start writing ordered buffers, write journaled buffers
         * into the log along with a header
         */
        gfs2_log_lock(sdp);
+       total_dbuf = sdp->sd_log_num_databuf;
+       total_jdata = sdp->sd_log_num_jdata;
        bd2 = bd1 = list_prepare_entry(bd1, &sdp->sd_log_le_databuf,
                                       bd_le.le_list);
        while(total_dbuf) {
@@ -581,10 +591,10 @@ static void databuf_lo_before_commit(struct gfs2_sbd *sdp)
                                gfs2_log_unlock(sdp);
                                if (!bh) {
                                        bh = gfs2_log_get_buf(sdp);
-                                       sdp->sd_log_num_hdrs++;
                                        ld = (struct gfs2_log_descriptor *)
                                             bh->b_data;
-                                       ptr = (__be64 *)(bh->b_data + offset);
+                                       ptr = (__be64 *)(bh->b_data +
+                                                        DATABUF_OFFSET);
                                        ld->ld_header.mh_magic =
                                                cpu_to_be32(GFS2_MAGIC);
                                        ld->ld_header.mh_type =
@@ -605,7 +615,7 @@ static void databuf_lo_before_commit(struct gfs2_sbd *sdp)
                                if (unlikely(magic != 0))
                                        set_buffer_escaped(bh1);
                                gfs2_log_lock(sdp);
-                               if (n++ > num)
+                               if (++n >= num)
                                        break;
                        } else if (!bh1) {
                                total_dbuf--;
@@ -625,6 +635,7 @@ static void databuf_lo_before_commit(struct gfs2_sbd *sdp)
                        set_buffer_dirty(bh);
                        ll_rw_block(WRITE, 1, &bh);
                        bh = NULL;
+                       ptr = NULL;
                }
                n = 0;
                gfs2_log_lock(sdp);
@@ -654,6 +665,7 @@ static void databuf_lo_before_commit(struct gfs2_sbd *sdp)
                                break;
                }
                bh = NULL;
+               BUG_ON(total_dbuf < num);
                total_dbuf -= num;
                total_jdata -= num;
        }