Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

author: David Woodhouse <dwmw2@shinybook.infradead.org> 2005-07-02 08:39:09 -0400
committer: David Woodhouse <dwmw2@shinybook.infradead.org> 2005-07-02 08:39:09 -0400
commit: d2f6409584e2c62ffad81690562330ff3bf4a458 (patch)
tree: 3bdfb97d0b51be2f7f414f2107e97603c1206abb /fs/isofs/rock.h
parent: e1b09eba2686eca94a3a188042b518df6044a3c1 (diff)
parent: 4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff)
1 files changed, 93 insertions, 90 deletions
diff --git a/fs/isofs/rock.h b/fs/isofs/rock.h
index deaf5c8e8b4a..ed09e2b08637 100644
--- a/fs/isofs/rock.h
+++ b/fs/isofs/rock.h
@@ -1,85 +1,88 @@
-/* These structs are used by the system-use-sharing protocol, in which the
+/*
-   Rock Ridge extensions are embedded.  It is quite possible that other
+ * These structs are used by the system-use-sharing protocol, in which the
-   extensions are present on the disk, and this is fine as long as they
+ * Rock Ridge extensions are embedded.  It is quite possible that other
-   all use SUSP */
+ * extensions are present on the disk, and this is fine as long as they
+ * all use SUSP
-struct SU_SP{
+ */
-  unsigned char magic[2];
-  unsigned char skip;
+struct SU_SP_s {
-} __attribute__((packed));
+        unsigned char magic[2];
+        unsigned char skip;
-struct SU_CE{
+} __attribute__ ((packed));
-  char extent[8];
-  char offset[8];
+struct SU_CE_s {
-  char size[8];
+        char extent[8];
+        char offset[8];
+        char size[8];
 };
-struct SU_ER{
+struct SU_ER_s {
-  unsigned char len_id;
+        unsigned char len_id;
-  unsigned char len_des;
+        unsigned char len_des;
-  unsigned char len_src;
+        unsigned char len_src;
-  unsigned char ext_ver;
+        unsigned char ext_ver;
-  char data[0];
+        char data[0];
-} __attribute__((packed));
+} __attribute__ ((packed));
-struct RR_RR{
+struct RR_RR_s {
-  char flags[1];
+        char flags[1];
-} __attribute__((packed));
+} __attribute__ ((packed));
-struct RR_PX{
+struct RR_PX_s {
-  char mode[8];
+        char mode[8];
-  char n_links[8];
+        char n_links[8];
-  char uid[8];
+        char uid[8];
-  char gid[8];
+        char gid[8];
 };
-struct RR_PN{
+struct RR_PN_s {
-  char dev_high[8];
+        char dev_high[8];
-  char dev_low[8];
+        char dev_low[8];
 };
+struct SL_component {
+        unsigned char flags;
+        unsigned char len;
+        char text[0];
+} __attribute__ ((packed));
-struct SL_component{
+struct RR_SL_s {
-  unsigned char flags;
+        unsigned char flags;
-  unsigned char len;
+        struct SL_component link;
-  char text[0];
+} __attribute__ ((packed));
-} __attribute__((packed));
-struct RR_SL{
+struct RR_NM_s {
-  unsigned char flags;
+        unsigned char flags;
-  struct SL_component link;
+        char name[0];
-} __attribute__((packed));
+} __attribute__ ((packed));
-struct RR_NM{
+struct RR_CL_s {
-  unsigned char flags;
+        char location[8];
-  char name[0];
-} __attribute__((packed));
-struct RR_CL{
-  char location[8];
 };
-struct RR_PL{
+struct RR_PL_s {
-  char location[8];
+        char location[8];
 };
-struct stamp{
+struct stamp {
-  char time[7];
+        char time[7];
-} __attribute__((packed));
+} __attribute__ ((packed));
-struct RR_TF{
+struct RR_TF_s {
-  char flags;
+        char flags;
-  struct stamp times[0];  /* Variable number of these beasts */
+        struct stamp times[0];  /* Variable number of these beasts */
-} __attribute__((packed));
+} __attribute__ ((packed));
 /* Linux-specific extension for transparent decompression */
-struct RR_ZF{
+struct RR_ZF_s {
-  char algorithm[2];
+        char algorithm[2];
-  char parms[2];
+        char parms[2];
-  char real_size[8];
+        char real_size[8];
 };
-/* These are the bits and their meanings for flags in the TF structure. */
+/*
+ * These are the bits and their meanings for flags in the TF structure.
+ */
 #define TF_CREATE 1
 #define TF_MODIFY 2
 #define TF_ACCESS 4
@@ -89,31 +92,31 @@ struct RR_ZF{
 #define TF_EFFECTIVE 64
 #define TF_LONG_FORM 128
-struct rock_ridge{
+struct rock_ridge {
-  char signature[2];
+        char signature[2];
-  unsigned char len;
+        unsigned char len;
-  unsigned char version;
+        unsigned char version;
-  union{
+        union {
-    struct SU_SP SP;
+                struct SU_SP_s SP;
-    struct SU_CE CE;
+                struct SU_CE_s CE;
-    struct SU_ER ER;
+                struct SU_ER_s ER;
-    struct RR_RR RR;
+                struct RR_RR_s RR;
-    struct RR_PX PX;
+                struct RR_PX_s PX;
-    struct RR_PN PN;
+                struct RR_PN_s PN;
-    struct RR_SL SL;
+                struct RR_SL_s SL;
-    struct RR_NM NM;
+                struct RR_NM_s NM;
-    struct RR_CL CL;
+                struct RR_CL_s CL;
-    struct RR_PL PL;
+                struct RR_PL_s PL;
-    struct RR_TF TF;
+                struct RR_TF_s TF;
-    struct RR_ZF ZF;
+                struct RR_ZF_s ZF;
-  } u;
+        } u;
 };
-#define RR_PX 1   /* POSIX attributes */
+#define RR_PX 1                 /* POSIX attributes */
-#define RR_PN 2   /* POSIX devices */
+#define RR_PN 2                 /* POSIX devices */
-#define RR_SL 4   /* Symbolic link */
+#define RR_SL 4                 /* Symbolic link */
-#define RR_NM 8   /* Alternate Name */
+#define RR_NM 8                 /* Alternate Name */
-#define RR_CL 16  /* Child link */
+#define RR_CL 16                /* Child link */
-#define RR_PL 32  /* Parent link */
+#define RR_PL 32                /* Parent link */
-#define RR_RE 64  /* Relocation directory */
+#define RR_RE 64                /* Relocation directory */
-#define RR_TF 128 /* Timestamps */
+#define RR_TF 128               /* Timestamps */
author	David Woodhouse <dwmw2@shinybook.infradead.org>	2005-07-02 08:39:09 -0400
committer	David Woodhouse <dwmw2@shinybook.infradead.org>	2005-07-02 08:39:09 -0400
commit	d2f6409584e2c62ffad81690562330ff3bf4a458 (patch)
tree	3bdfb97d0b51be2f7f414f2107e97603c1206abb /fs/isofs/rock.h
parent	e1b09eba2686eca94a3a188042b518df6044a3c1 (diff)
parent	4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff)

diff --git a/fs/isofs/rock.h b/fs/isofs/rock.h index deaf5c8e8b4a..ed09e2b08637 100644 --- a/fs/isofs/rock.h +++ b/fs/isofs/rock.h
@@ -1,85 +1,88 @@
1	/* These structs are used by the system-use-sharing protocol, in which the	1	/*
2	Rock Ridge extensions are embedded. It is quite possible that other	2	* These structs are used by the system-use-sharing protocol, in which the
3	extensions are present on the disk, and this is fine as long as they	3	* Rock Ridge extensions are embedded. It is quite possible that other
4	all use SUSP */	4	* extensions are present on the disk, and this is fine as long as they
5		5	* all use SUSP
6	struct SU_SP{	6	*/
7	unsigned char magic[2];	7
8	unsigned char skip;	8	struct SU_SP_s {
9	} __attribute__((packed));	9	unsigned char magic[2];
10		10	unsigned char skip;
11	struct SU_CE{	11	} __attribute__ ((packed));
12	char extent[8];	12
13	char offset[8];	13	struct SU_CE_s {
14	char size[8];	14	char extent[8];
		15	char offset[8];
		16	char size[8];
15	};	17	};
16		18
17	struct SU_ER{	19	struct SU_ER_s {
18	unsigned char len_id;	20	unsigned char len_id;
19	unsigned char len_des;	21	unsigned char len_des;
20	unsigned char len_src;	22	unsigned char len_src;
21	unsigned char ext_ver;	23	unsigned char ext_ver;
22	char data[0];	24	char data[0];
23	} __attribute__((packed));	25	} __attribute__ ((packed));
24		26
25	struct RR_RR{	27	struct RR_RR_s {
26	char flags[1];	28	char flags[1];
27	} __attribute__((packed));	29	} __attribute__ ((packed));
28		30
29	struct RR_PX{	31	struct RR_PX_s {
30	char mode[8];	32	char mode[8];
31	char n_links[8];	33	char n_links[8];
32	char uid[8];	34	char uid[8];
33	char gid[8];	35	char gid[8];
34	};	36	};
35		37
36	struct RR_PN{	38	struct RR_PN_s {
37	char dev_high[8];	39	char dev_high[8];
38	char dev_low[8];	40	char dev_low[8];
39	};	41	};
40		42
		43	struct SL_component {
		44	unsigned char flags;
		45	unsigned char len;
		46	char text[0];
		47	} __attribute__ ((packed));
41		48
42	struct SL_component{	49	struct RR_SL_s {
43	unsigned char flags;	50	unsigned char flags;
44	unsigned char len;	51	struct SL_component link;
45	char text[0];	52	} __attribute__ ((packed));
46	} __attribute__((packed));
47		53
48	struct RR_SL{	54	struct RR_NM_s {
49	unsigned char flags;	55	unsigned char flags;
50	struct SL_component link;	56	char name[0];
51	} __attribute__((packed));	57	} __attribute__ ((packed));
52		58
53	struct RR_NM{	59	struct RR_CL_s {
54	unsigned char flags;	60	char location[8];
55	char name[0];
56	} __attribute__((packed));
57
58	struct RR_CL{
59	char location[8];
60	};	61	};
61		62
62	struct RR_PL{	63	struct RR_PL_s {
63	char location[8];	64	char location[8];
64	};	65	};
65		66
66	struct stamp{	67	struct stamp {
67	char time[7];	68	char time[7];
68	} __attribute__((packed));	69	} __attribute__ ((packed));
69		70
70	struct RR_TF{	71	struct RR_TF_s {
71	char flags;	72	char flags;
72	struct stamp times[0]; /* Variable number of these beasts */	73	struct stamp times[0]; /* Variable number of these beasts */
73	} __attribute__((packed));	74	} __attribute__ ((packed));
74		75
75	/* Linux-specific extension for transparent decompression */	76	/* Linux-specific extension for transparent decompression */
76	struct RR_ZF{	77	struct RR_ZF_s {
77	char algorithm[2];	78	char algorithm[2];
78	char parms[2];	79	char parms[2];
79	char real_size[8];	80	char real_size[8];
80	};	81	};
81		82
82	/* These are the bits and their meanings for flags in the TF structure. */	83	/*
		84	* These are the bits and their meanings for flags in the TF structure.
		85	*/
83	#define TF_CREATE 1	86	#define TF_CREATE 1
84	#define TF_MODIFY 2	87	#define TF_MODIFY 2
85	#define TF_ACCESS 4	88	#define TF_ACCESS 4
@@ -89,31 +92,31 @@ struct RR_ZF{
89	#define TF_EFFECTIVE 64	92	#define TF_EFFECTIVE 64
90	#define TF_LONG_FORM 128	93	#define TF_LONG_FORM 128
91		94
92	struct rock_ridge{	95	struct rock_ridge {
93	char signature[2];	96	char signature[2];
94	unsigned char len;	97	unsigned char len;
95	unsigned char version;	98	unsigned char version;
96	union{	99	union {
97	struct SU_SP SP;	100	struct SU_SP_s SP;
98	struct SU_CE CE;	101	struct SU_CE_s CE;
99	struct SU_ER ER;	102	struct SU_ER_s ER;
100	struct RR_RR RR;	103	struct RR_RR_s RR;
101	struct RR_PX PX;	104	struct RR_PX_s PX;
102	struct RR_PN PN;	105	struct RR_PN_s PN;
103	struct RR_SL SL;	106	struct RR_SL_s SL;
104	struct RR_NM NM;	107	struct RR_NM_s NM;
105	struct RR_CL CL;	108	struct RR_CL_s CL;
106	struct RR_PL PL;	109	struct RR_PL_s PL;
107	struct RR_TF TF;	110	struct RR_TF_s TF;
108	struct RR_ZF ZF;	111	struct RR_ZF_s ZF;
109	} u;	112	} u;
110	};	113	};
111		114
112	#define RR_PX 1 /* POSIX attributes */	115	#define RR_PX 1 /* POSIX attributes */
113	#define RR_PN 2 /* POSIX devices */	116	#define RR_PN 2 /* POSIX devices */
114	#define RR_SL 4 /* Symbolic link */	117	#define RR_SL 4 /* Symbolic link */
115	#define RR_NM 8 /* Alternate Name */	118	#define RR_NM 8 /* Alternate Name */
116	#define RR_CL 16 /* Child link */	119	#define RR_CL 16 /* Child link */
117	#define RR_PL 32 /* Parent link */	120	#define RR_PL 32 /* Parent link */
118	#define RR_RE 64 /* Relocation directory */	121	#define RR_RE 64 /* Relocation directory */
119	#define RR_TF 128 /* Timestamps */	122	#define RR_TF 128 /* Timestamps */