Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 948c6d4f authored Aug 23, 2007 by Eric Sandeen Committed by Tim Shimmin Oct 15, 2007

[XFS] optimize dmapi event tests w/o dmapi config



SGI-PV: 969372
SGI-Modid: xfs-linux-melb:xfs-kern:29444a

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Vlad Apostolov <vapo@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

parent eb9df39d

fs/xfs/xfs_dmapi.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -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) \| \

fs/xfs/xfs_vfsops.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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.