diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/xfs/xfs_attr_sf.h | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/xfs/xfs_attr_sf.h')
-rw-r--r-- | fs/xfs/xfs_attr_sf.h | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/fs/xfs/xfs_attr_sf.h b/fs/xfs/xfs_attr_sf.h index ea22839caed2..919756e3ba53 100644 --- a/fs/xfs/xfs_attr_sf.h +++ b/fs/xfs/xfs_attr_sf.h | |||
@@ -25,8 +25,6 @@ | |||
25 | * to fit into the literal area of the inode. | 25 | * to fit into the literal area of the inode. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | struct xfs_inode; | ||
29 | |||
30 | /* | 28 | /* |
31 | * Entries are packed toward the top as tight as possible. | 29 | * Entries are packed toward the top as tight as possible. |
32 | */ | 30 | */ |
@@ -54,7 +52,7 @@ typedef struct xfs_attr_sf_sort { | |||
54 | __uint8_t valuelen; /* length of value */ | 52 | __uint8_t valuelen; /* length of value */ |
55 | __uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */ | 53 | __uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */ |
56 | xfs_dahash_t hash; /* this entry's hash value */ | 54 | xfs_dahash_t hash; /* this entry's hash value */ |
57 | char *name; /* name value, pointer into buffer */ | 55 | unsigned char *name; /* name value, pointer into buffer */ |
58 | } xfs_attr_sf_sort_t; | 56 | } xfs_attr_sf_sort_t; |
59 | 57 | ||
60 | #define XFS_ATTR_SF_ENTSIZE_BYNAME(nlen,vlen) /* space name/value uses */ \ | 58 | #define XFS_ATTR_SF_ENTSIZE_BYNAME(nlen,vlen) /* space name/value uses */ \ |
@@ -69,42 +67,4 @@ typedef struct xfs_attr_sf_sort { | |||
69 | (be16_to_cpu(((xfs_attr_shortform_t *) \ | 67 | (be16_to_cpu(((xfs_attr_shortform_t *) \ |
70 | ((dp)->i_afp->if_u1.if_data))->hdr.totsize)) | 68 | ((dp)->i_afp->if_u1.if_data))->hdr.totsize)) |
71 | 69 | ||
72 | #if defined(XFS_ATTR_TRACE) | ||
73 | /* | ||
74 | * Kernel tracing support for attribute lists | ||
75 | */ | ||
76 | struct xfs_attr_list_context; | ||
77 | struct xfs_da_intnode; | ||
78 | struct xfs_da_node_entry; | ||
79 | struct xfs_attr_leafblock; | ||
80 | |||
81 | #define XFS_ATTR_TRACE_SIZE 4096 /* size of global trace buffer */ | ||
82 | extern ktrace_t *xfs_attr_trace_buf; | ||
83 | |||
84 | /* | ||
85 | * Trace record types. | ||
86 | */ | ||
87 | #define XFS_ATTR_KTRACE_L_C 1 /* context */ | ||
88 | #define XFS_ATTR_KTRACE_L_CN 2 /* context, node */ | ||
89 | #define XFS_ATTR_KTRACE_L_CB 3 /* context, btree */ | ||
90 | #define XFS_ATTR_KTRACE_L_CL 4 /* context, leaf */ | ||
91 | |||
92 | void xfs_attr_trace_l_c(char *where, struct xfs_attr_list_context *context); | ||
93 | void xfs_attr_trace_l_cn(char *where, struct xfs_attr_list_context *context, | ||
94 | struct xfs_da_intnode *node); | ||
95 | void xfs_attr_trace_l_cb(char *where, struct xfs_attr_list_context *context, | ||
96 | struct xfs_da_node_entry *btree); | ||
97 | void xfs_attr_trace_l_cl(char *where, struct xfs_attr_list_context *context, | ||
98 | struct xfs_attr_leafblock *leaf); | ||
99 | void xfs_attr_trace_enter(int type, char *where, | ||
100 | struct xfs_attr_list_context *context, | ||
101 | __psunsigned_t a13, __psunsigned_t a14, | ||
102 | __psunsigned_t a15); | ||
103 | #else | ||
104 | #define xfs_attr_trace_l_c(w,c) | ||
105 | #define xfs_attr_trace_l_cn(w,c,n) | ||
106 | #define xfs_attr_trace_l_cb(w,c,b) | ||
107 | #define xfs_attr_trace_l_cl(w,c,l) | ||
108 | #endif /* XFS_ATTR_TRACE */ | ||
109 | |||
110 | #endif /* __XFS_ATTR_SF_H__ */ | 70 | #endif /* __XFS_ATTR_SF_H__ */ |