From 5c9b914c021eb04f42bd72b26f58d99d5f9a1803 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@sandeen.net>
Date: Thu, 23 Aug 2007 16:19:57 +1000
Subject: [PATCH] --- yaml --- r: 70827 b: refs/heads/master c:
 948c6d4fd894d9c7f9ad764cedbe443aa866def2 h: refs/heads/master i:   70825:
 f17cf96ba5b5468d050da313a9aedfb2fc9f2e5d   70823:
 c396f95d91e26cd9e0489acb95649b586c060136 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/xfs/xfs_dmapi.h  | 4 ++++
 trunk/fs/xfs/xfs_vfsops.c | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d5fa79e72c8b..da25c31a308a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb9df39daf870d6f9e9528f092d506be04ebad2f
+refs/heads/master: 948c6d4fd894d9c7f9ad764cedbe443aa866def2
diff --git a/trunk/fs/xfs/xfs_dmapi.h b/trunk/fs/xfs/xfs_dmapi.h
index 988cf446d9e7..98b4d6325a20 100644
--- a/trunk/fs/xfs/xfs_dmapi.h
+++ b/trunk/fs/xfs/xfs_dmapi.h
@@ -67,11 +67,15 @@ typedef enum {
 #define HAVE_DM_RIGHT_T
 
 /* Defines for determining if an event message should be sent. */
+#ifdef HAVE_DMAPI
 #define	DM_EVENT_ENABLED(ip, event) ( \
 	unlikely (XFS_MTOVFS((ip)->i_mount)->vfs_flag & VFS_DMI) && \
 		( ((ip)->i_d.di_dmevmask & (1 << event)) || \
 		  ((ip)->i_mount->m_dmevmask & (1 << event)) ) \
 	)
+#else
+#define DM_EVENT_ENABLED(ip, event)	(0)
+#endif
 
 #define DM_XFS_VALID_FS_EVENTS		( \
 	(1 << DM_EVENT_PREUNMOUNT)	| \
diff --git a/trunk/fs/xfs/xfs_vfsops.c b/trunk/fs/xfs/xfs_vfsops.c
index ba8f7a3e4028..4a27648b5446 100644
--- a/trunk/fs/xfs/xfs_vfsops.c
+++ b/trunk/fs/xfs/xfs_vfsops.c
@@ -572,6 +572,7 @@ xfs_unmount(
 	rip = mp->m_rootip;
 	rvp = XFS_ITOV(rip);
 
+#ifdef HAVE_DMAPI
 	if (vfsp->vfs_flag & VFS_DMI) {
 		error = XFS_SEND_PREUNMOUNT(mp, vfsp,
 				rvp, DM_RIGHT_NULL, rvp, DM_RIGHT_NULL,
@@ -584,7 +585,7 @@ xfs_unmount(
 		unmount_event_flags = (mp->m_dmevmask & (1<<DM_EVENT_UNMOUNT))?
 					0 : DM_FLAGS_UNWANTED;
 	}
-
+#endif
 	/*
 	 * First blow any referenced inode from this file system
 	 * out of the reference cache, and delete the timer.