patch-2.4.9 linux/fs/partitions/ldm.h

• Lines: 34
• Date: Wed Aug 15 14:24:54 2001
• Orig file: v2.4.8/linux/fs/partitions/ldm.h
• Orig date: Sun Aug 12 13:28:00 2001

diff -u --recursive --new-file v2.4.8/linux/fs/partitions/ldm.h linux/fs/partitions/ldm.h
@@ -80,21 +80,22 @@
 #define TOC_BITMAP1		"config"	/* Names of the two defined */
 #define TOC_BITMAP2		"log"		/* bitmaps in the TOCBLOCK. */
 
-/* Borrowed from msdos.c */
-#define SYS_IND(p)		(get_unaligned(&p->sys_ind))
-#define NR_SECTS(p)		({ __typeof__(p->nr_sects) __a =	\
-					get_unaligned(&p->nr_sects);	\
-					le32_to_cpu(__a);		\
-				})
-#define START_SECT(p)		({ __typeof__(p->start_sect) __a =	\
-					get_unaligned(&p->start_sect);	\
-					le32_to_cpu(__a);		\
-				})
-
 /* Most numbers we deal with are big-endian and won't be aligned. */
 #define BE16(x)			((u16)be16_to_cpu(get_unaligned((u16*)(x))))
 #define BE32(x)			((u32)be32_to_cpu(get_unaligned((u32*)(x))))
 #define BE64(x)			((u64)be64_to_cpu(get_unaligned((u64*)(x))))
+
+/* Borrowed from msdos.c. */
+#define SYS_IND(p)		(get_unaligned(&(p)->sys_ind))
+#define NR_SECTS(p)		({ __typeof__((p)->nr_sects) __a =	\
+					get_unaligned(&(p)->nr_sects);	\
+					le32_to_cpu(__a);		\
+				})
+
+#define START_SECT(p)		({ __typeof__((p)->start_sect) __a =	\
+					get_unaligned(&(p)->start_sect);\
+					le32_to_cpu(__a);		\
+				})
 
 /* In memory LDM database structures. */