[libata] get-identity ioctl: Fix use of invalid memory pointer

[pandora-kernel.git] / fs / quotaio_v2.h

diff --git a/fs/quotaio_v2.h b/fs/quotaio_v2.h
index 303d7cb..530fe58 100644 (file)
--- a/fs/quotaio_v2.h
+++ b/fs/quotaio_v2.h
@@ -21,6 +21,12 @@
        0               /* GRPQUOTA */\
 }
 
+/* First generic header */
+struct v2_disk_dqheader {
+       __le32 dqh_magic;       /* Magic number identifying file */
+       __le32 dqh_version;     /* File version */
+};
+
 /*
  * The following structure defines the format of the disk quota file
  * (as it appears on disk) - the file is a radix tree whose leaves point
@@ -38,15 +44,6 @@ struct v2_disk_dqblk {
        __le64 dqb_itime;       /* time limit for excessive inode use */
 };
 
-/*
- * Here are header structures as written on disk and their in-memory copies
- */
-/* First generic header */
-struct v2_disk_dqheader {
-       __le32 dqh_magic;       /* Magic number identifying file */
-       __le32 dqh_version;     /* File version */
-};
-
 /* Header with type and version specific information */
 struct v2_disk_dqinfo {
        __le32 dqi_bgrace;      /* Time before block soft limit becomes hard limit */
@@ -57,23 +54,7 @@ struct v2_disk_dqinfo {
        __le32 dqi_free_entry;  /* Number of block with at least one free entry */
 };
 
-/*
- *  Structure of header of block with quota structures. It is padded to 16 bytes so
- *  there will be space for exactly 21 quota-entries in a block
- */
-struct v2_disk_dqdbheader {
-       __le32 dqdh_next_free;  /* Number of next block with free entry */
-       __le32 dqdh_prev_free;  /* Number of previous block with free entry */
-       __le16 dqdh_entries;    /* Number of valid entries in block */
-       __le16 dqdh_pad1;
-       __le32 dqdh_pad2;
-};
-
 #define V2_DQINFOOFF   sizeof(struct v2_disk_dqheader) /* Offset of info header in file */
-#define V2_DQBLKSIZE_BITS      10
-#define V2_DQBLKSIZE   (1 << V2_DQBLKSIZE_BITS)        /* Size of block with quota structures */
-#define V2_DQTREEOFF   1               /* Offset of tree in file in blocks */
-#define V2_DQTREEDEPTH 4               /* Depth of quota tree */
-#define V2_DQSTRINBLK  ((V2_DQBLKSIZE - sizeof(struct v2_disk_dqdbheader)) / sizeof(struct v2_disk_dqblk))     /* Number of entries in one blocks */
+#define V2_DQBLKSIZE_BITS 10                           /* Size of leaf block in tree */
 
 #endif /* _LINUX_QUOTAIO_V2_H */