diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2008-11-04 05:05:22 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2009-01-05 02:38:59 -0500 |
commit | 383f01fbf4a701b73f5e35ea805ed1700b4b4db9 (patch) | |
tree | b2b7a1a188088f319a29e8cc4cc924490837352b /fs/gfs2/incore.h | |
parent | c9e98886776386f1f7828d9685e78cd341849867 (diff) |
GFS2: Banish struct gfs2_dinode_host
The final field in gfs2_dinode_host was the i_flags field. Thats
renamed to i_diskflags in order to avoid confusion with the existing
inode flags, and moved into the inode proper at a suitable location
to avoid creating a "hole".
At that point struct gfs2_dinode_host is no longer needed and as
promised (quite some time ago!) it can now be removed completely.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/incore.h')
-rw-r--r-- | fs/gfs2/incore.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 4596cd254be6..6f67e753f883 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h | |||
@@ -233,9 +233,6 @@ enum { | |||
233 | GIF_USER = 4, /* user inode, not metadata addr space */ | 233 | GIF_USER = 4, /* user inode, not metadata addr space */ |
234 | }; | 234 | }; |
235 | 235 | ||
236 | struct gfs2_dinode_host { | ||
237 | u32 di_flags; /* GFS2_DIF_... */ | ||
238 | }; | ||
239 | 236 | ||
240 | struct gfs2_inode { | 237 | struct gfs2_inode { |
241 | struct inode i_inode; | 238 | struct inode i_inode; |
@@ -245,9 +242,6 @@ struct gfs2_inode { | |||
245 | u64 i_eattr; | 242 | u64 i_eattr; |
246 | loff_t i_disksize; | 243 | loff_t i_disksize; |
247 | unsigned long i_flags; /* GIF_... */ | 244 | unsigned long i_flags; /* GIF_... */ |
248 | |||
249 | struct gfs2_dinode_host i_di; /* To be replaced by ref to block */ | ||
250 | |||
251 | struct gfs2_glock *i_gl; /* Move into i_gh? */ | 245 | struct gfs2_glock *i_gl; /* Move into i_gh? */ |
252 | struct gfs2_holder i_iopen_gh; | 246 | struct gfs2_holder i_iopen_gh; |
253 | struct gfs2_holder i_gh; /* for prepare/commit_write only */ | 247 | struct gfs2_holder i_gh; /* for prepare/commit_write only */ |
@@ -255,6 +249,7 @@ struct gfs2_inode { | |||
255 | u64 i_goal; /* goal block for allocations */ | 249 | u64 i_goal; /* goal block for allocations */ |
256 | struct rw_semaphore i_rw_mutex; | 250 | struct rw_semaphore i_rw_mutex; |
257 | u32 i_entries; | 251 | u32 i_entries; |
252 | u32 i_diskflags; | ||
258 | u8 i_height; | 253 | u8 i_height; |
259 | u8 i_depth; | 254 | u8 i_depth; |
260 | }; | 255 | }; |