diff options
author | Dave Chinner <dchinner@redhat.com> | 2013-08-12 06:49:37 -0400 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2013-08-12 17:40:57 -0400 |
commit | 2b9ab5ab9c4a1f16f11ad883bfd21d5eb55e5bcc (patch) | |
tree | 1b55a17209cfde971a8bfca70d14cc2c937e8fbe /fs/xfs/xfs_dir2_data.c | |
parent | 4a8af273de63d9656559ba5289e91f40aae0441f (diff) |
xfs: reshuffle dir2 definitions around for userspace
Many of the definitions within xfs_dir2_priv.h are needed in
userspace outside libxfs. Definitions within xfs_dir2_priv.h are
wholly contained within libxfs, so we need to shuffle some of the
definitions around to keep consistency across files shared between
user and kernel space.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_dir2_data.c')
-rw-r--r-- | fs/xfs/xfs_dir2_data.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/xfs/xfs_dir2_data.c b/fs/xfs/xfs_dir2_data.c index c2930238005c..4e1917dd6c5b 100644 --- a/fs/xfs/xfs_dir2_data.c +++ b/fs/xfs/xfs_dir2_data.c | |||
@@ -29,14 +29,12 @@ | |||
29 | #include "xfs_dinode.h" | 29 | #include "xfs_dinode.h" |
30 | #include "xfs_inode.h" | 30 | #include "xfs_inode.h" |
31 | #include "xfs_dir2_format.h" | 31 | #include "xfs_dir2_format.h" |
32 | #include "xfs_dir2.h" | ||
32 | #include "xfs_dir2_priv.h" | 33 | #include "xfs_dir2_priv.h" |
33 | #include "xfs_error.h" | 34 | #include "xfs_error.h" |
34 | #include "xfs_buf_item.h" | 35 | #include "xfs_buf_item.h" |
35 | #include "xfs_cksum.h" | 36 | #include "xfs_cksum.h" |
36 | 37 | ||
37 | STATIC xfs_dir2_data_free_t * | ||
38 | xfs_dir2_data_freefind(xfs_dir2_data_hdr_t *hdr, xfs_dir2_data_unused_t *dup); | ||
39 | |||
40 | /* | 38 | /* |
41 | * Check the consistency of the data block. | 39 | * Check the consistency of the data block. |
42 | * The input can also be a block-format directory. | 40 | * The input can also be a block-format directory. |
@@ -325,7 +323,7 @@ xfs_dir3_data_readahead( | |||
325 | * Given a data block and an unused entry from that block, | 323 | * Given a data block and an unused entry from that block, |
326 | * return the bestfree entry if any that corresponds to it. | 324 | * return the bestfree entry if any that corresponds to it. |
327 | */ | 325 | */ |
328 | STATIC xfs_dir2_data_free_t * | 326 | xfs_dir2_data_free_t * |
329 | xfs_dir2_data_freefind( | 327 | xfs_dir2_data_freefind( |
330 | xfs_dir2_data_hdr_t *hdr, /* data block */ | 328 | xfs_dir2_data_hdr_t *hdr, /* data block */ |
331 | xfs_dir2_data_unused_t *dup) /* data unused entry */ | 329 | xfs_dir2_data_unused_t *dup) /* data unused entry */ |