Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[pandora-kernel.git] / include / linux / gfs2_ondisk.h

diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index 4fc297a..8b7e4c1 100644 (file)
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -213,8 +213,6 @@ struct gfs2_rgrp {
 };
 
 struct gfs2_rgrp_host {
-       struct gfs2_meta_header_host rg_header;
-
        __u32 rg_flags;
        __u32 rg_free;
        __u32 rg_dinodes;
@@ -322,21 +320,8 @@ struct gfs2_dinode {
 };
 
 struct gfs2_dinode_host {
-       struct gfs2_meta_header_host di_header;
-
-       struct gfs2_inum_host di_num;
-
-       __u32 di_mode;  /* mode of file */
-       __u32 di_uid;   /* owner's user id */
-       __u32 di_gid;   /* owner's group id */
-       __u32 di_nlink; /* number of links to this file */
        __u64 di_size;  /* number of bytes in file */
        __u64 di_blocks;        /* number of blocks in file */
-       __u64 di_atime; /* time last accessed */
-       __u64 di_mtime; /* time last modified */
-       __u64 di_ctime; /* time last changed */
-       __u32 di_major; /* device major number */
-       __u32 di_minor; /* device minor number */
 
        /* This section varies from gfs1. Padding added to align with
          * remainder of dinode
@@ -346,7 +331,6 @@ struct gfs2_dinode_host {
        __u64 di_generation;    /* generation number for NFS */
 
        __u32 di_flags; /* GFS2_DIF_... */
-       __u32 di_payload_format;  /* GFS2_FORMAT_... */
        __u16 di_height;        /* height of metadata */
 
        /* These only apply to directories  */
@@ -528,7 +512,6 @@ struct gfs2_quota_change_host {
 
 extern void gfs2_inum_in(struct gfs2_inum_host *no, const void *buf);
 extern void gfs2_inum_out(const struct gfs2_inum_host *no, void *buf);
-extern void gfs2_meta_header_in(struct gfs2_meta_header_host *mh, const void *buf);
 extern void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf);
 extern void gfs2_rindex_in(struct gfs2_rindex_host *ri, const void *buf);
 extern void gfs2_rindex_out(const struct gfs2_rindex_host *ri, void *buf);
@@ -549,7 +532,7 @@ extern void gfs2_quota_change_in(struct gfs2_quota_change_host *qc, const void *
 /* Printing functions */
 
 extern void gfs2_rindex_print(const struct gfs2_rindex_host *ri);
-extern void gfs2_dinode_print(const struct gfs2_dinode_host *di);
+extern void gfs2_dinode_print(const struct gfs2_inode *ip);
 
 #endif /* __KERNEL__ */