[GFS2] Update copyright, tidy up incore.h

[linux-2.6] / fs / gfs2 / log.c

diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 483d4fa987f64d03126faeaa79c8265dbc690e1a..45ea3ec6f776e3d9e8ce387c7a861d24f3b9ab2e 100644 (file)
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -4,7 +4,7 @@
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
 #include <linux/sched.h>
@@ -214,7 +214,7 @@ static uint64_t log_bmap(struct gfs2_sbd *sdp, unsigned int lbn)
 
        error = gfs2_block_map(sdp->sd_jdesc->jd_inode, lbn, &new, &dbn, &bdy);
        if (!(!error && dbn)) {
-               printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, dbn, lbn);
+               printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, (unsigned long long)dbn, lbn);
        }
        gfs2_assert_withdraw(sdp, !error && dbn);
 
@@ -256,8 +256,8 @@ static unsigned int current_tail(struct gfs2_sbd *sdp)
        if (list_empty(&sdp->sd_ail1_list))
                tail = sdp->sd_log_head;
        else {
-               ai = list_entry(sdp->sd_ail1_list.prev,
-                               struct gfs2_ail, ai_list);
+               ai = list_entry(sdp->sd_ail1_list.prev, struct gfs2_ail,
+                               ai_list);
                tail = ai->ai_first;
        }
 
@@ -386,10 +386,10 @@ static void log_write_header(struct gfs2_sbd *sdp, uint32_t flags, int pull)
        lh->lh_header.mh_magic = cpu_to_be32(GFS2_MAGIC);
        lh->lh_header.mh_type = cpu_to_be32(GFS2_METATYPE_LH);
        lh->lh_header.mh_format = cpu_to_be32(GFS2_FORMAT_LH);
-       lh->lh_sequence = be64_to_cpu(sdp->sd_log_sequence++);
-       lh->lh_flags = be32_to_cpu(flags);
-       lh->lh_tail = be32_to_cpu(tail);
-       lh->lh_blkno = be32_to_cpu(sdp->sd_log_flush_head);
+       lh->lh_sequence = cpu_to_be64(sdp->sd_log_sequence++);
+       lh->lh_flags = cpu_to_be32(flags);
+       lh->lh_tail = cpu_to_be32(tail);
+       lh->lh_blkno = cpu_to_be32(sdp->sd_log_flush_head);
        hash = gfs2_disk_hash(bh->b_data, sizeof(struct gfs2_log_header));
        lh->lh_hash = cpu_to_be32(hash);
 
@@ -509,7 +509,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl)
 
 static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
 {
-       unsigned int reserved = 1;
+       unsigned int reserved = 0;
        unsigned int old;
 
        gfs2_log_lock(sdp);
@@ -524,6 +524,8 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
        if (sdp->sd_log_commited_revoke)
                reserved += gfs2_struct2blk(sdp, sdp->sd_log_commited_revoke,
                                            sizeof(uint64_t));
+       if (reserved)
+               reserved++;
 
        old = sdp->sd_log_blks_free;
        sdp->sd_log_blks_free += tr->tr_reserved -