From a22d4f14cd316487c421ce664f7eb14e0556ddab Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Wed, 26 Mar 2003 21:13:53 +0100 Subject: [PATCH] [XFS] Header shuffling to try and keep several source trees aligned - move the realtime inode detection macro somewhere more appropriate. SGI Modid: 2.5.x-xfs:slinx:141951a --- fs/xfs/xfs_quota.h | 5 +++-- fs/xfs/xfs_rtalloc.h | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h index c951c90e90832..57c2bb304aa34 100644 --- a/fs/xfs/xfs_quota.h +++ b/fs/xfs/xfs_quota.h @@ -234,6 +234,7 @@ typedef struct xfs_qoff_logformat { #define XFS_QMOPT_QUOTALL (XFS_QMOPT_UQUOTA|XFS_QMOPT_GQUOTA) #define XFS_QMOPT_RESBLK_MASK (XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_RES_RTBLKS) +#ifdef __KERNEL__ /* * This check is done typically without holding the inode lock; * that may seem racey, but it is harmless in the context that it is used. @@ -261,8 +262,6 @@ typedef struct xfs_qoff_logformat { #define XFS_MOUNT_QUOTA_MASK (XFS_MOUNT_QUOTA_ALL | XFS_UQUOTA_ACTIVE | \ XFS_GQUOTA_ACTIVE) -#define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) - /* * The structure kept inside the xfs_trans_t keep track of dquot changes @@ -351,4 +350,6 @@ extern struct bhv_vfsops xfs_qmops; extern void xfs_qm_init(void); extern void xfs_qm_exit(void); +#endif /* __KERNEL__ */ + #endif /* __XFS_QUOTA_H__ */ diff --git a/fs/xfs/xfs_rtalloc.h b/fs/xfs/xfs_rtalloc.h index 286436f823d15..19e70410788da 100644 --- a/fs/xfs/xfs_rtalloc.h +++ b/fs/xfs/xfs_rtalloc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved. + * Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as @@ -35,6 +35,8 @@ struct xfs_mount; struct xfs_trans; +#define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) + /* Min and max rt extent sizes, specified in bytes */ #define XFS_MAX_RTEXTSIZE (1024 * 1024 * 1024) /* 1GB */ #define XFS_DFL_RTEXTSIZE (64 * 1024) /* 64KB */ -- 2.53.0