[XFS] cleanup vnode use in dmapi calls

SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30545a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

1 files changed, 4 insertions, 9 deletions

diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index edab1ffbb163..05905246434d 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -469,16 +469,11 @@ xfs_file_open_exec(
         struct inode    *inode)
 {
         struct xfs_mount *mp = XFS_M(inode->i_sb);
+        struct xfs_inode *ip = XFS_I(inode);
 
-        if (unlikely(mp->m_flags & XFS_MOUNT_DMAPI)) {
-                if (DM_EVENT_ENABLED(XFS_I(inode), DM_EVENT_READ)) {
-                        bhv_vnode_t *vp = vn_from_inode(inode);
-
-                        return -XFS_SEND_DATA(mp, DM_EVENT_READ,
-                                                vp, 0, 0, 0, NULL);
-                }
-        }
-
+        if (unlikely(mp->m_flags & XFS_MOUNT_DMAPI) &&
+                     DM_EVENT_ENABLED(ip, DM_EVENT_READ))
+                return -XFS_SEND_DATA(mp, DM_EVENT_READ, ip, 0, 0, 0, NULL);
         return 0;
 }
 #endif /* HAVE_FOP_OPEN_EXEC */