[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>
This commit is contained in:
parent
eb9df39daf
commit
948c6d4fd8
|
@ -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) | \
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue