[GFS2] Add generation number

[pandora-kernel.git] / fs / gfs2 / ondisk.c

diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c
index b3bc21a..39c7f03 100644 (file)
--- a/fs/gfs2/ondisk.c
+++ b/fs/gfs2/ondisk.c
@@ -50,8 +50,8 @@ void gfs2_inum_out(const struct gfs2_inum *no, char *buf)
 
 static void gfs2_inum_print(struct gfs2_inum *no)
 {
-       pv(no, no_formal_ino, "%llu");
-       pv(no, no_addr, "%llu");
+       printk(KERN_INFO "  no_formal_ino = %llu\n", (unsigned long long)no->no_formal_ino);
+       printk(KERN_INFO "  no_addr = %llu\n", (unsigned long long)no->no_addr);
 }
 
 static void gfs2_meta_header_in(struct gfs2_meta_header *mh, char *buf)
@@ -111,10 +111,10 @@ void gfs2_rindex_in(struct gfs2_rindex *ri, char *buf)
 
 void gfs2_rindex_print(struct gfs2_rindex *ri)
 {
-       pv(ri, ri_addr, "%llu");
+       printk(KERN_INFO "  ri_addr = %llu\n", (unsigned long long)ri->ri_addr);
        pv(ri, ri_length, "%u");
 
-       pv(ri, ri_data0, "%llu");
+       printk(KERN_INFO "  ri_data0 = %llu\n", (unsigned long long)ri->ri_data0);
        pv(ri, ri_data, "%u");
 
        pv(ri, ri_bitbytes, "%u");
@@ -128,6 +128,7 @@ void gfs2_rgrp_in(struct gfs2_rgrp *rg, char *buf)
        rg->rg_flags = be32_to_cpu(str->rg_flags);
        rg->rg_free = be32_to_cpu(str->rg_free);
        rg->rg_dinodes = be32_to_cpu(str->rg_dinodes);
+       rg->rg_igeneration = be64_to_cpu(str->rg_igeneration);
 }
 
 void gfs2_rgrp_out(struct gfs2_rgrp *rg, char *buf)
@@ -138,7 +139,8 @@ void gfs2_rgrp_out(struct gfs2_rgrp *rg, char *buf)
        str->rg_flags = cpu_to_be32(rg->rg_flags);
        str->rg_free = cpu_to_be32(rg->rg_free);
        str->rg_dinodes = cpu_to_be32(rg->rg_dinodes);
-
+       str->__pad = cpu_to_be32(0);
+       str->rg_igeneration = cpu_to_be64(rg->rg_igeneration);
        memset(&str->rg_reserved, 0, sizeof(str->rg_reserved));
 }
 
@@ -172,6 +174,7 @@ void gfs2_dinode_in(struct gfs2_dinode *di, char *buf)
 
        di->di_goal_meta = be64_to_cpu(str->di_goal_meta);
        di->di_goal_data = be64_to_cpu(str->di_goal_data);
+       di->di_generation = be64_to_cpu(str->di_generation);
 
        di->di_flags = be32_to_cpu(str->di_flags);
        di->di_payload_format = be32_to_cpu(str->di_payload_format);
@@ -205,6 +208,7 @@ void gfs2_dinode_out(struct gfs2_dinode *di, char *buf)
 
        str->di_goal_meta = cpu_to_be64(di->di_goal_meta);
        str->di_goal_data = cpu_to_be64(di->di_goal_data);
+       str->di_generation = cpu_to_be64(di->di_generation);
 
        str->di_flags = cpu_to_be32(di->di_flags);
        str->di_payload_format = cpu_to_be32(di->di_payload_format);
@@ -226,16 +230,16 @@ void gfs2_dinode_print(struct gfs2_dinode *di)
        pv(di, di_uid, "%u");
        pv(di, di_gid, "%u");
        pv(di, di_nlink, "%u");
-       pv(di, di_size, "%llu");
-       pv(di, di_blocks, "%llu");
-       pv(di, di_atime, "%lld");
-       pv(di, di_mtime, "%lld");
-       pv(di, di_ctime, "%lld");
+       printk(KERN_INFO "  di_size = %llu\n", (unsigned long long)di->di_size);
+       printk(KERN_INFO "  di_blocks = %llu\n", (unsigned long long)di->di_blocks);
+       printk(KERN_INFO "  di_atime = %lld\n", (long long)di->di_atime);
+       printk(KERN_INFO "  di_mtime = %lld\n", (long long)di->di_mtime);
+       printk(KERN_INFO "  di_ctime = %lld\n", (long long)di->di_ctime);
        pv(di, di_major, "%u");
        pv(di, di_minor, "%u");
 
-       pv(di, di_goal_meta, "%llu");
-       pv(di, di_goal_data, "%llu");
+       printk(KERN_INFO "  di_goal_meta = %llu\n", (unsigned long long)di->di_goal_meta);
+       printk(KERN_INFO "  di_goal_data = %llu\n", (unsigned long long)di->di_goal_data);
 
        pv(di, di_flags, "0x%.8X");
        pv(di, di_payload_format, "%u");
@@ -244,7 +248,7 @@ void gfs2_dinode_print(struct gfs2_dinode *di)
        pv(di, di_depth, "%u");
        pv(di, di_entries, "%u");
 
-       pv(di, di_eattr, "%llu");
+       printk(KERN_INFO "  di_eattr = %llu\n", (unsigned long long)di->di_eattr);
 }
 
 void gfs2_log_header_in(struct gfs2_log_header *lh, char *buf)
@@ -293,23 +297,6 @@ void gfs2_statfs_change_out(struct gfs2_statfs_change *sc, char *buf)
        str->sc_dinodes = cpu_to_be64(sc->sc_dinodes);
 }
 
-void gfs2_unlinked_tag_in(struct gfs2_unlinked_tag *ut, char *buf)
-{
-       struct gfs2_unlinked_tag *str = (struct gfs2_unlinked_tag *)buf;
-
-       gfs2_inum_in(&ut->ut_inum, buf);
-       ut->ut_flags = be32_to_cpu(str->ut_flags);
-}
-
-void gfs2_unlinked_tag_out(struct gfs2_unlinked_tag *ut, char *buf)
-{
-       struct gfs2_unlinked_tag *str = (struct gfs2_unlinked_tag *)buf;
-
-       gfs2_inum_out(&ut->ut_inum, buf);
-       str->ut_flags = cpu_to_be32(ut->ut_flags);
-       str->__pad = 0;
-}
-
 void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf)
 {
        struct gfs2_quota_change *str = (struct gfs2_quota_change *)buf;