diff options
author | Christoph Hellwig <hch@infradead.org> | 2007-08-16 04:42:07 -0400 |
---|---|---|
committer | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2007-10-15 02:45:25 -0400 |
commit | eb9df39daf870d6f9e9528f092d506be04ebad2f (patch) | |
tree | 77646f792ae63f00d3e08e6081e80afefe87e4e7 /fs/xfs/xfs_dmapi.h | |
parent | 49ee6c911f0ae5b3a9a04e0589e3265e52f94f53 (diff) |
[XFS] remove unessecary vfs argument to DM_EVENT_ENABLED
SGI-PV: 968690
SGI-Modid: xfs-linux-melb:xfs-kern:29340a
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Vlad Apostolov <vapo@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_dmapi.h')
-rw-r--r-- | fs/xfs/xfs_dmapi.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/xfs/xfs_dmapi.h b/fs/xfs/xfs_dmapi.h index adc3d251240d..988cf446d9e7 100644 --- a/fs/xfs/xfs_dmapi.h +++ b/fs/xfs/xfs_dmapi.h | |||
@@ -67,18 +67,12 @@ typedef enum { | |||
67 | #define HAVE_DM_RIGHT_T | 67 | #define HAVE_DM_RIGHT_T |
68 | 68 | ||
69 | /* Defines for determining if an event message should be sent. */ | 69 | /* Defines for determining if an event message should be sent. */ |
70 | #define DM_EVENT_ENABLED(vfsp, ip, event) ( \ | 70 | #define DM_EVENT_ENABLED(ip, event) ( \ |
71 | unlikely ((vfsp)->vfs_flag & VFS_DMI) && \ | 71 | unlikely (XFS_MTOVFS((ip)->i_mount)->vfs_flag & VFS_DMI) && \ |
72 | ( ((ip)->i_d.di_dmevmask & (1 << event)) || \ | 72 | ( ((ip)->i_d.di_dmevmask & (1 << event)) || \ |
73 | ((ip)->i_mount->m_dmevmask & (1 << event)) ) \ | 73 | ((ip)->i_mount->m_dmevmask & (1 << event)) ) \ |
74 | ) | 74 | ) |
75 | 75 | ||
76 | #define DM_EVENT_ENABLED_IO(vfsp, io, event) ( \ | ||
77 | unlikely ((vfsp)->vfs_flag & VFS_DMI) && \ | ||
78 | ( ((io)->io_dmevmask & (1 << event)) || \ | ||
79 | ((io)->io_mount->m_dmevmask & (1 << event)) ) \ | ||
80 | ) | ||
81 | |||
82 | #define DM_XFS_VALID_FS_EVENTS ( \ | 76 | #define DM_XFS_VALID_FS_EVENTS ( \ |
83 | (1 << DM_EVENT_PREUNMOUNT) | \ | 77 | (1 << DM_EVENT_PREUNMOUNT) | \ |
84 | (1 << DM_EVENT_UNMOUNT) | \ | 78 | (1 << DM_EVENT_UNMOUNT) | \ |