Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[karo-tx-linux.git] / include / linux / gfs2_ondisk.h

diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index c035587d066eb59455ef267972fe524a82ec0239..a44a6a078f0a68b487ff6d049c71b6ceea154a05 100644 (file)
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -54,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.
@@ -128,23 +121,6 @@ struct gfs2_sb {
        /* In gfs1, quota and license dinodes followed */
 };
 
-struct gfs2_sb_host {
-       struct gfs2_meta_header sb_header;
-
-       __u32 sb_fs_format;
-       __u32 sb_multihost_format;
-
-       __u32 sb_bsize;
-       __u32 sb_bsize_shift;
-
-       struct gfs2_inum sb_master_dir; /* Was jindex dinode in gfs1 */
-       struct gfs2_inum sb_root_dir;
-
-       char sb_lockproto[GFS2_LOCKNAME_LEN];
-       char sb_locktable[GFS2_LOCKNAME_LEN];
-       /* In gfs1, quota and license dinodes followed */
-};
-
 /*
  * resource index structure
  */
@@ -193,15 +169,6 @@ struct gfs2_rgrp {
        __u8 rg_reserved[80]; /* Several fields from gfs1 now reserved */
 };
 
-struct gfs2_rgrp_host {
-       struct gfs2_meta_header rg_header;
-
-       __u32 rg_flags;
-       __u32 rg_free;
-       __u32 rg_dinodes;
-       __u64 rg_igeneration;
-};
-
 /*
  * quota structure
  */
@@ -292,43 +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];
-};
-
-struct gfs2_dinode_host {
-       struct gfs2_meta_header di_header;
-
-       struct gfs2_inum 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
-        */
-       __u64 di_goal_meta;     /* rgrp to alloc from next */
-       __u64 di_goal_data;     /* data block goal */
-       __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  */
-       __u16 di_depth; /* Number of bits in the table */
-       __u32 di_entries;       /* The number of entries in the directory */
-
-       __u64 di_eattr; /* extended attribute block number */
+       __u8 di_reserved[44];
 };
 
 /*
@@ -445,11 +380,6 @@ struct gfs2_inum_range {
        __be64 ir_length;
 };
 
-struct gfs2_inum_range_host {
-       __u64 ir_start;
-       __u64 ir_length;
-};
-
 /*
  * Statfs change
  * Describes an change to the pool of free and allocated
@@ -476,34 +406,12 @@ struct gfs2_quota_change {
        __be32 qc_id;
 };
 
-#ifdef __KERNEL__
-/* Translation functions */
-
-extern void gfs2_inum_in(struct gfs2_inum *no, const void *buf);
-extern void gfs2_inum_out(const struct gfs2_inum *no, void *buf);
-extern void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf);
-extern void gfs2_rindex_in(struct gfs2_rindex *ri, const void *buf);
-extern void gfs2_rindex_out(const struct gfs2_rindex *ri, void *buf);
-extern void gfs2_rgrp_in(struct gfs2_rgrp_host *rg, const void *buf);
-extern void gfs2_rgrp_out(const struct gfs2_rgrp_host *rg, void *buf);
-extern void gfs2_quota_in(struct gfs2_quota *qu, const void *buf);
-extern void gfs2_quota_out(const struct gfs2_quota *qu, void *buf);
-extern void gfs2_dinode_in(struct gfs2_dinode_host *di, const void *buf);
-extern void gfs2_dinode_out(const struct gfs2_dinode_host *di, void *buf);
-extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, const void *buf);
-extern void gfs2_ea_header_out(const struct gfs2_ea_header *ea, void *buf);
-extern void gfs2_log_header_in(struct gfs2_log_header *lh, const void *buf);
-extern void gfs2_inum_range_in(struct gfs2_inum_range_host *ir, const void *buf);
-extern void gfs2_inum_range_out(const struct gfs2_inum_range_host *ir, void *buf);
-extern void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, const void *buf);
-extern void gfs2_statfs_change_out(const struct gfs2_statfs_change *sc, void *buf);
-extern void gfs2_quota_change_in(struct gfs2_quota_change *qc, const void *buf);
-
-/* Printing functions */
-
-extern void gfs2_rindex_print(const struct gfs2_rindex *ri);
-extern void gfs2_dinode_print(const struct gfs2_dinode_host *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__ */