Change the HAVE_DMAPI symbol to be XFS_DMAPI instead, so it
is more appropriately restricted to the XFS name space. Move
its definition into "xfs_dmapi.h"; the only other file that
needs it #includes that file.
Signed-off-by: Alex Elder <aelder@xxxxxxx>
---
fs/xfs/xfs_dmapi.h | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
Index: b/fs/xfs/xfs_dmapi.h
===================================================================
--- a/fs/xfs/xfs_dmapi.h
+++ b/fs/xfs/xfs_dmapi.h
@@ -18,6 +18,11 @@
#ifndef __XFS_DMAPI_H__
#define __XFS_DMAPI_H__
+#undef XFS_DMAPI
+#if defined(CONFIG_XFS_DMAPI) || defined(CONFIG_XFS_DMAPI_MODULE)
+#define XFS_DMAPI
+#endif
+
/* Values used to define the on-disk version of dm_attrname_t. All
* on-disk attribute names start with the 8-byte string "SGI_DMI_".
*
@@ -66,15 +71,15 @@ typedef enum {
#define HAVE_DM_RIGHT_T
/* Defines for determining if an event message should be sent. */
-#ifdef HAVE_DMAPI
+#ifdef XFS_DMAPI
#define DM_EVENT_ENABLED(ip, event) ( \
unlikely ((ip)->i_mount->m_flags & XFS_MOUNT_DMAPI) && \
( ((ip)->i_d.di_dmevmask & (1 << event)) || \
((ip)->i_mount->m_dmevmask & (1 << event)) ) \
)
-#else
+#else /* ! XFS_DMAPI */
#define DM_EVENT_ENABLED(ip, event) (0)
-#endif
+#endif /* ! XFS_DMAPI */
#define DM_XFS_VALID_FS_EVENTS ( \
(1 << DM_EVENT_PREUNMOUNT) | \
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
