Merge branch 'ioat-md-accel-for-linus' of git://lost.foo-projects.org/~dwillia2/git/iop

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

diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index 4356e38..a44a6a0 100644 (file)
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -1,11 +1,11 @@
 /*
-* Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
-* Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
-*
-* 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.
-*/
+ * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
+ *
+ * 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.
+ */
 
 #ifndef __GFS2_ONDISK_DOT_H__
 #define __GFS2_ONDISK_DOT_H__
@@ -36,7 +36,6 @@
 #define GFS2_FORMAT_LB         1000
 #define GFS2_FORMAT_EA         1600
 #define GFS2_FORMAT_ED         1700
-#define GFS2_FORMAT_UT         1300
 #define GFS2_FORMAT_QC         1400
 /* These are format numbers for entities contained in files */
 #define GFS2_FORMAT_RI         1100
@@ -55,13 +54,6 @@ struct gfs2_inum {
        __be64 no_addr;
 };
 
-static inline int gfs2_inum_equal(const struct gfs2_inum *ino1,
-                                 const struct gfs2_inum *ino2)
-{
-       return ino1->no_formal_ino == ino2->no_formal_ino &&
-              ino1->no_addr == ino2->no_addr;
-}
-
 /*
  * Generic metadata head structure
  * Every inplace buffer logged in the journal must start with this.
@@ -80,7 +72,6 @@ static inline int gfs2_inum_equal(const struct gfs2_inum *ino1,
 #define GFS2_METATYPE_LB       12
 #define GFS2_METATYPE_EA       10
 #define GFS2_METATYPE_ED       11
-#define GFS2_METATYPE_UT       13
 #define GFS2_METATYPE_QC       14
 
 struct gfs2_meta_header {
@@ -158,7 +149,7 @@ struct gfs2_rindex {
 
 #define GFS2_BLKST_FREE                0
 #define GFS2_BLKST_USED                1
-#define GFS2_BLKST_INVALID     2
+#define GFS2_BLKST_UNLINKED    2
 #define GFS2_BLKST_DINODE      3
 
 #define GFS2_RGF_JOURNAL       0x00000001
@@ -172,8 +163,10 @@ struct gfs2_rgrp {
        __be32 rg_flags;
        __be32 rg_free;
        __be32 rg_dinodes;
+       __be32 __pad;
+       __be64 rg_igeneration;
 
-       __u8 rg_reserved[92]; /* Several fields from gfs1 now reserved */
+       __u8 rg_reserved[80]; /* Several fields from gfs1 now reserved */
 };
 
 /*
@@ -250,7 +243,7 @@ struct gfs2_dinode {
         */
        __be64 di_goal_meta;    /* rgrp to alloc from next */
        __be64 di_goal_data;    /* data block goal */
-       __u32 __pad[2];
+       __be64 di_generation;   /* generation number for NFS */
 
        __be32 di_flags;        /* GFS2_DIF_... */
        __be32 di_payload_format;  /* GFS2_FORMAT_... */
@@ -266,8 +259,11 @@ struct gfs2_dinode {
        struct gfs2_inum __pad4; /* Unused even in current gfs1 */
 
        __be64 di_eattr;        /* extended attribute block number */
+       __be32 di_atime_nsec;   /* nsec portion of atime */
+       __be32 di_mtime_nsec;   /* nsec portion of mtime */
+       __be32 di_ctime_nsec;   /* nsec portion of ctime */
 
-       __u8 di_reserved[56];
+       __u8 di_reserved[44];
 };
 
 /*
@@ -311,8 +307,9 @@ struct gfs2_leaf {
 #define GFS2_EATYPE_UNUSED     0
 #define GFS2_EATYPE_USR                1
 #define GFS2_EATYPE_SYS                2
+#define GFS2_EATYPE_SECURITY   3
 
-#define GFS2_EATYPE_LAST       2
+#define GFS2_EATYPE_LAST       3
 #define GFS2_EATYPE_VALID(x)   ((x) <= GFS2_EATYPE_LAST)
 
 #define GFS2_EAFLAG_LAST       0x01    /* last ea in block */
@@ -395,20 +392,6 @@ struct gfs2_statfs_change {
        __be64 sc_dinodes;
 };
 
-/*
- * Unlinked Tag
- * Describes an allocated inode that isn't linked into
- * the directory tree and might need to be deallocated.
- */
-
-#define GFS2_UTF_UNINIT                0x00000001
-
-struct gfs2_unlinked_tag {
-       struct gfs2_inum ut_inum;
-       __be32 ut_flags;        /* GFS2_UTF_... */
-       __u32 __pad;
-};
-
 /*
  * Quota change
  * Describes an allocation change for a particular
@@ -423,36 +406,12 @@ struct gfs2_quota_change {
        __be32 qc_id;
 };
 
-#ifdef __KERNEL__
-/* Translation functions */
-
-extern void gfs2_inum_in(struct gfs2_inum *no, char *buf);
-extern void gfs2_inum_out(const struct gfs2_inum *no, char *buf);
-extern void gfs2_sb_in(struct gfs2_sb *sb, char *buf);
-extern void gfs2_rindex_in(struct gfs2_rindex *ri, char *buf);
-extern void gfs2_rindex_out(struct gfs2_rindex *ri, char *buf);
-extern void gfs2_rgrp_in(struct gfs2_rgrp *rg, char *buf);
-extern void gfs2_rgrp_out(struct gfs2_rgrp *rg, char *buf);
-extern void gfs2_quota_in(struct gfs2_quota *qu, char *buf);
-extern void gfs2_quota_out(struct gfs2_quota *qu, char *buf);
-extern void gfs2_dinode_in(struct gfs2_dinode *di, char *buf);
-extern void gfs2_dinode_out(struct gfs2_dinode *di, char *buf);
-extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, char *buf);
-extern void gfs2_ea_header_out(struct gfs2_ea_header *ea, char *buf);
-extern void gfs2_log_header_in(struct gfs2_log_header *lh, char *buf);
-extern void gfs2_inum_range_in(struct gfs2_inum_range *ir, char *buf);
-extern void gfs2_inum_range_out(struct gfs2_inum_range *ir, char *buf);
-extern void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, char *buf);
-extern void gfs2_statfs_change_out(struct gfs2_statfs_change *sc, char *buf);
-extern void gfs2_unlinked_tag_in(struct gfs2_unlinked_tag *ut, char *buf);
-extern void gfs2_unlinked_tag_out(struct gfs2_unlinked_tag *ut, char *buf);
-extern void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf);
-
-/* Printing functions */
-
-extern void gfs2_rindex_print(struct gfs2_rindex *ri);
-extern void gfs2_dinode_print(struct gfs2_dinode *di);
-
-#endif /* __KERNEL__ */
+struct gfs2_quota_lvb {
+        __be32 qb_magic;
+        __u32 __pad;
+        __be64 qb_limit;      /* Hard limit of # blocks to alloc */
+        __be64 qb_warn;       /* Warn user when alloc is above this # */
+        __be64 qb_value;       /* Current # blocks allocated */
+};
 
 #endif /* __GFS2_ONDISK_DOT_H__ */