diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-01 11:05:15 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-01 11:05:15 -0400 |
commit | e9fc2aa091ab8fa46e60d4c9d06a89305c441652 (patch) | |
tree | 8cdf5fcc4adba8cd53c51f824b5d8107ce0f4bba /fs/gfs2/incore.h | |
parent | c6e6f0ba8fc1dea99c7bd020916f24d533b62697 (diff) |
[GFS2] Update copyright, tidy up incore.h
As per comments from Jan Engelhardt <jengelh@linux01.gwdg.de> this
updates the copyright message to say "version" in full rather than
"v.2". Also incore.h has been updated to remove forward structure
declarations which are not required.
The gfs2_quota_lvb structure has now had endianess annotations added
to it. Also quota.c has been updated so that we now store the
lvb data locally in endian independant format to avoid needing
a structure in host endianess too. As a result the endianess
conversions are done as required at various points and thus the
conversion routines in lvb.[ch] are no longer required. I've
moved the one remaining constant in lvb.h thats used into lm.h
and removed the unused lvb.[ch].
I have not changed the HIF_ constants. That is left to a later patch
which I hope will unify the gh_flags and gh_iflags fields of the
struct gfs2_holder.
Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/incore.h')
-rw-r--r-- | fs/gfs2/incore.h | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 362c2422d506..06f5ec6ebf7f 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * This copyrighted material is made available to anyone wishing to use, | 5 | * This copyrighted material is made available to anyone wishing to use, |
6 | * modify, copy, or redistribute it subject to the terms and conditions | 6 | * modify, copy, or redistribute it subject to the terms and conditions |
7 | * of the GNU General Public License v.2. | 7 | * of the GNU General Public License version 2. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #ifndef __INCORE_DOT_H__ | 10 | #ifndef __INCORE_DOT_H__ |
@@ -22,24 +22,12 @@ | |||
22 | 22 | ||
23 | struct gfs2_log_operations; | 23 | struct gfs2_log_operations; |
24 | struct gfs2_log_element; | 24 | struct gfs2_log_element; |
25 | struct gfs2_bitmap; | ||
26 | struct gfs2_rgrpd; | ||
27 | struct gfs2_bufdata; | ||
28 | struct gfs2_glock_operations; | ||
29 | struct gfs2_holder; | 25 | struct gfs2_holder; |
30 | struct gfs2_glock; | 26 | struct gfs2_glock; |
31 | struct gfs2_alloc; | ||
32 | struct gfs2_inode; | ||
33 | struct gfs2_file; | ||
34 | struct gfs2_revoke; | ||
35 | struct gfs2_revoke_replay; | ||
36 | struct gfs2_quota_data; | 27 | struct gfs2_quota_data; |
37 | struct gfs2_log_buf; | ||
38 | struct gfs2_trans; | 28 | struct gfs2_trans; |
39 | struct gfs2_ail; | 29 | struct gfs2_ail; |
40 | struct gfs2_jdesc; | 30 | struct gfs2_jdesc; |
41 | struct gfs2_args; | ||
42 | struct gfs2_tune; | ||
43 | struct gfs2_gl_hash_bucket; | 31 | struct gfs2_gl_hash_bucket; |
44 | struct gfs2_sbd; | 32 | struct gfs2_sbd; |
45 | 33 | ||
@@ -215,8 +203,8 @@ struct gfs2_glock { | |||
215 | struct gfs2_alloc { | 203 | struct gfs2_alloc { |
216 | /* Quota stuff */ | 204 | /* Quota stuff */ |
217 | 205 | ||
218 | struct gfs2_quota_data *al_qd[4]; | 206 | struct gfs2_quota_data *al_qd[2*MAXQUOTAS]; |
219 | struct gfs2_holder al_qd_ghs[4]; | 207 | struct gfs2_holder al_qd_ghs[2*MAXQUOTAS]; |
220 | unsigned int al_qd_num; | 208 | unsigned int al_qd_num; |
221 | 209 | ||
222 | u32 al_requested; /* Filled in by caller of gfs2_inplace_reserve() */ | 210 | u32 al_requested; /* Filled in by caller of gfs2_inplace_reserve() */ |
@@ -305,11 +293,11 @@ enum { | |||
305 | }; | 293 | }; |
306 | 294 | ||
307 | struct gfs2_quota_lvb { | 295 | struct gfs2_quota_lvb { |
308 | uint32_t qb_magic; | 296 | __be32 qb_magic; |
309 | uint32_t __pad; | 297 | u32 __pad; |
310 | uint64_t qb_limit; /* Hard limit of # blocks to alloc */ | 298 | __be64 qb_limit; /* Hard limit of # blocks to alloc */ |
311 | uint64_t qb_warn; /* Warn user when alloc is above this # */ | 299 | __be64 qb_warn; /* Warn user when alloc is above this # */ |
312 | int64_t qb_value; /* Current # blocks allocated */ | 300 | __be64 qb_value; /* Current # blocks allocated */ |
313 | }; | 301 | }; |
314 | 302 | ||
315 | struct gfs2_quota_data { | 303 | struct gfs2_quota_data { |