diff options
author | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2007-06-06 16:28:35 -0400 |
---|---|---|
committer | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2007-06-06 16:28:35 -0400 |
commit | f720e3ba558680cc7dd3995d005bdc8ee2ef46af (patch) | |
tree | 7217f0618795aa1c0a097adf73442842e6fd668c /fs/jfs/jfs_xtree.h | |
parent | 5ecd3100e695228ac5e0ce0e325e252c0f11806f (diff) |
JFS: Whitespace cleanup and remove some dead code
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Diffstat (limited to 'fs/jfs/jfs_xtree.h')
-rw-r--r-- | fs/jfs/jfs_xtree.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/fs/jfs/jfs_xtree.h b/fs/jfs/jfs_xtree.h index 164f6f2b1019..70815c8a3d6a 100644 --- a/fs/jfs/jfs_xtree.h +++ b/fs/jfs/jfs_xtree.h | |||
@@ -19,14 +19,14 @@ | |||
19 | #define _H_JFS_XTREE | 19 | #define _H_JFS_XTREE |
20 | 20 | ||
21 | /* | 21 | /* |
22 | * jfs_xtree.h: extent allocation descriptor B+-tree manager | 22 | * jfs_xtree.h: extent allocation descriptor B+-tree manager |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "jfs_btree.h" | 25 | #include "jfs_btree.h" |
26 | 26 | ||
27 | 27 | ||
28 | /* | 28 | /* |
29 | * extent allocation descriptor (xad) | 29 | * extent allocation descriptor (xad) |
30 | */ | 30 | */ |
31 | typedef struct xad { | 31 | typedef struct xad { |
32 | unsigned flag:8; /* 1: flag */ | 32 | unsigned flag:8; /* 1: flag */ |
@@ -38,30 +38,30 @@ typedef struct xad { | |||
38 | __le32 addr2; /* 4: address in unit of fsblksize */ | 38 | __le32 addr2; /* 4: address in unit of fsblksize */ |
39 | } xad_t; /* (16) */ | 39 | } xad_t; /* (16) */ |
40 | 40 | ||
41 | #define MAXXLEN ((1 << 24) - 1) | 41 | #define MAXXLEN ((1 << 24) - 1) |
42 | 42 | ||
43 | #define XTSLOTSIZE 16 | 43 | #define XTSLOTSIZE 16 |
44 | #define L2XTSLOTSIZE 4 | 44 | #define L2XTSLOTSIZE 4 |
45 | 45 | ||
46 | /* xad_t field construction */ | 46 | /* xad_t field construction */ |
47 | #define XADoffset(xad, offset64)\ | 47 | #define XADoffset(xad, offset64)\ |
48 | {\ | 48 | {\ |
49 | (xad)->off1 = ((u64)offset64) >> 32;\ | 49 | (xad)->off1 = ((u64)offset64) >> 32;\ |
50 | (xad)->off2 = __cpu_to_le32((offset64) & 0xffffffff);\ | 50 | (xad)->off2 = __cpu_to_le32((offset64) & 0xffffffff);\ |
51 | } | 51 | } |
52 | #define XADaddress(xad, address64)\ | 52 | #define XADaddress(xad, address64)\ |
53 | {\ | 53 | {\ |
54 | (xad)->addr1 = ((u64)address64) >> 32;\ | 54 | (xad)->addr1 = ((u64)address64) >> 32;\ |
55 | (xad)->addr2 = __cpu_to_le32((address64) & 0xffffffff);\ | 55 | (xad)->addr2 = __cpu_to_le32((address64) & 0xffffffff);\ |
56 | } | 56 | } |
57 | #define XADlength(xad, length32) (xad)->len = __cpu_to_le24(length32) | 57 | #define XADlength(xad, length32) (xad)->len = __cpu_to_le24(length32) |
58 | 58 | ||
59 | /* xad_t field extraction */ | 59 | /* xad_t field extraction */ |
60 | #define offsetXAD(xad)\ | 60 | #define offsetXAD(xad)\ |
61 | ( ((s64)((xad)->off1)) << 32 | __le32_to_cpu((xad)->off2)) | 61 | ( ((s64)((xad)->off1)) << 32 | __le32_to_cpu((xad)->off2)) |
62 | #define addressXAD(xad)\ | 62 | #define addressXAD(xad)\ |
63 | ( ((s64)((xad)->addr1)) << 32 | __le32_to_cpu((xad)->addr2)) | 63 | ( ((s64)((xad)->addr1)) << 32 | __le32_to_cpu((xad)->addr2)) |
64 | #define lengthXAD(xad) __le24_to_cpu((xad)->len) | 64 | #define lengthXAD(xad) __le24_to_cpu((xad)->len) |
65 | 65 | ||
66 | /* xad list */ | 66 | /* xad list */ |
67 | struct xadlist { | 67 | struct xadlist { |
@@ -71,22 +71,22 @@ struct xadlist { | |||
71 | }; | 71 | }; |
72 | 72 | ||
73 | /* xad_t flags */ | 73 | /* xad_t flags */ |
74 | #define XAD_NEW 0x01 /* new */ | 74 | #define XAD_NEW 0x01 /* new */ |
75 | #define XAD_EXTENDED 0x02 /* extended */ | 75 | #define XAD_EXTENDED 0x02 /* extended */ |
76 | #define XAD_COMPRESSED 0x04 /* compressed with recorded length */ | 76 | #define XAD_COMPRESSED 0x04 /* compressed with recorded length */ |
77 | #define XAD_NOTRECORDED 0x08 /* allocated but not recorded */ | 77 | #define XAD_NOTRECORDED 0x08 /* allocated but not recorded */ |
78 | #define XAD_COW 0x10 /* copy-on-write */ | 78 | #define XAD_COW 0x10 /* copy-on-write */ |
79 | 79 | ||
80 | 80 | ||
81 | /* possible values for maxentry */ | 81 | /* possible values for maxentry */ |
82 | #define XTROOTINITSLOT_DIR 6 | 82 | #define XTROOTINITSLOT_DIR 6 |
83 | #define XTROOTINITSLOT 10 | 83 | #define XTROOTINITSLOT 10 |
84 | #define XTROOTMAXSLOT 18 | 84 | #define XTROOTMAXSLOT 18 |
85 | #define XTPAGEMAXSLOT 256 | 85 | #define XTPAGEMAXSLOT 256 |
86 | #define XTENTRYSTART 2 | 86 | #define XTENTRYSTART 2 |
87 | 87 | ||
88 | /* | 88 | /* |
89 | * xtree page: | 89 | * xtree page: |
90 | */ | 90 | */ |
91 | typedef union { | 91 | typedef union { |
92 | struct xtheader { | 92 | struct xtheader { |
@@ -106,7 +106,7 @@ typedef union { | |||
106 | } xtpage_t; | 106 | } xtpage_t; |
107 | 107 | ||
108 | /* | 108 | /* |
109 | * external declaration | 109 | * external declaration |
110 | */ | 110 | */ |
111 | extern int xtLookup(struct inode *ip, s64 lstart, s64 llen, | 111 | extern int xtLookup(struct inode *ip, s64 lstart, s64 llen, |
112 | int *pflag, s64 * paddr, int *plen, int flag); | 112 | int *pflag, s64 * paddr, int *plen, int flag); |