From 9380c752cf85eb3c007452a7edc2e53b301f4876 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 5 Feb 2008 01:44:04 +0000 Subject: [PATCH] Add a conditional so we don't have to drag in everything when a user just wants to use hammer_ioctl.h. Reported-by: "Simon 'corecode' Schubert" --- sys/vfs/hammer/hammer_disk.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/vfs/hammer/hammer_disk.h b/sys/vfs/hammer/hammer_disk.h index fcb7fb995e..133e4d3371 100644 --- a/sys/vfs/hammer/hammer_disk.h +++ b/sys/vfs/hammer/hammer_disk.h @@ -31,7 +31,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/vfs/hammer/hammer_disk.h,v 1.20 2008/02/04 08:33:17 dillon Exp $ + * $DragonFly: src/sys/vfs/hammer/hammer_disk.h,v 1.21 2008/02/05 01:44:04 dillon Exp $ */ #ifndef VFS_HAMMER_DISK_H_ @@ -80,6 +80,12 @@ typedef u_int64_t hammer_tid_t; #define HAMMER_MAX_RECTYPE 0xFFFFU /* + * Don't include the whole mess unless the caller also has included + * the hammer alist header. The ioctl code only needs hammer_tid_t. + */ +#ifdef HAMMER_ALIST_METAELMS_256_1LYR + +/* * Most HAMMER data structures are embedded in 16K filesystem buffers. * All filesystem buffers except those designated as pure-data buffers * contain this 128-byte header. @@ -705,4 +711,6 @@ union hammer_data_ondisk { struct hammer_inode_data inode; }; +#endif /* HAMMER_ALIST_METAELMS_256_1LYR */ + #endif -- 2.11.4.GIT