Merge ../linux-2.6-watchdog-mm

[linux-2.6-omap-h63xx.git] / include / linux / gfs2_ondisk.h

diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index f1ea0b48060b73ab0518439ba7757b16204cb739..8b7e4c1e32ae2c8f80d2f8182e2452add7c18451 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,14 +320,8 @@ struct gfs2_dinode {
 };
 
 struct gfs2_dinode_host {
-       __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 */
 
        /* This section varies from gfs1. Padding added to align with
          * remainder of dinode
@@ -339,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  */