X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fgfs2_ondisk.h;h=3ebd8743ce8c40deb3dc3bb1d462b4368f5f5eb1;hb=b1b934d31d8a608fe69fc56d6e539548b55b0601;hp=3ab40917383f2ab716dd14cbac4c185a12fad3a5;hpb=7ea9ea832212c4a755650f7c7cc1ff0b63292a41;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index 3ab40917383..3ebd8743ce8 100644
--- 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
@@ -80,7 +79,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 +156,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 +170,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 +250,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_... */
@@ -311,8 +311,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 +396,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
@@ -444,28 +431,12 @@ 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_inum_print(struct gfs2_inum *no);
-extern void gfs2_meta_header_print(struct gfs2_meta_header *mh);
-extern void gfs2_sb_print(struct gfs2_sb *sb);
 extern void gfs2_rindex_print(struct gfs2_rindex *ri);
-extern void gfs2_rgrp_print(struct gfs2_rgrp *rg);
-extern void gfs2_quota_print(struct gfs2_quota *qu);
 extern void gfs2_dinode_print(struct gfs2_dinode *di);
-extern void gfs2_dirent_print(struct gfs2_dirent *de, char *name);
-extern void gfs2_leaf_print(struct gfs2_leaf *lf);
-extern void gfs2_ea_header_print(struct gfs2_ea_header *ea, char *name);
-extern void gfs2_log_header_print(struct gfs2_log_header *lh);
-extern void gfs2_log_descriptor_print(struct gfs2_log_descriptor *ld);
-extern void gfs2_inum_range_print(struct gfs2_inum_range *ir);
-extern void gfs2_statfs_change_print(struct gfs2_statfs_change *sc);
-extern void gfs2_unlinked_tag_print(struct gfs2_unlinked_tag *ut);
-extern void gfs2_quota_change_print(struct gfs2_quota_change *qc);
 
 #endif /* __KERNEL__ */