Commit 4ef99242 authored by Dean Roehrich's avatar Dean Roehrich Committed by Stephen Lord

[XFS] Change dm_send_destroy_event to use vnode ptrs rather than bhv ptrs

SGI Modid: 2.5.x-xfs:slinx:158752a
parent 14145346
...@@ -94,7 +94,7 @@ struct xfs_bmap_free; ...@@ -94,7 +94,7 @@ struct xfs_bmap_free;
typedef int (*xfs_send_data_t)(int, struct bhv_desc *, typedef int (*xfs_send_data_t)(int, struct bhv_desc *,
xfs_off_t, size_t, int, vrwlock_t *); xfs_off_t, size_t, int, vrwlock_t *);
typedef int (*xfs_send_mmap_t)(struct vm_area_struct *, uint); typedef int (*xfs_send_mmap_t)(struct vm_area_struct *, uint);
typedef int (*xfs_send_destroy_t)(struct bhv_desc *, dm_right_t); typedef int (*xfs_send_destroy_t)(struct vnode *, dm_right_t);
typedef int (*xfs_send_namesp_t)(dm_eventtype_t, struct vnode *, typedef int (*xfs_send_namesp_t)(dm_eventtype_t, struct vnode *,
dm_right_t, struct vnode *, dm_right_t, dm_right_t, struct vnode *, dm_right_t,
char *, char *, mode_t, int, int); char *, char *, mode_t, int, int);
...@@ -113,8 +113,8 @@ typedef struct xfs_dmops { ...@@ -113,8 +113,8 @@ typedef struct xfs_dmops {
(*(mp)->m_dm_ops.xfs_send_data)(ev,bdp,off,len,fl,lock) (*(mp)->m_dm_ops.xfs_send_data)(ev,bdp,off,len,fl,lock)
#define XFS_SEND_MMAP(mp, vma,fl) \ #define XFS_SEND_MMAP(mp, vma,fl) \
(*(mp)->m_dm_ops.xfs_send_mmap)(vma,fl) (*(mp)->m_dm_ops.xfs_send_mmap)(vma,fl)
#define XFS_SEND_DESTROY(mp, bdp,right) \ #define XFS_SEND_DESTROY(mp, vp,right) \
(*(mp)->m_dm_ops.xfs_send_destroy)(bdp,right) (*(mp)->m_dm_ops.xfs_send_destroy)(vp,right)
#define XFS_SEND_NAMESP(mp, ev,b1,r1,b2,r2,n1,n2,mode,rval,fl) \ #define XFS_SEND_NAMESP(mp, ev,b1,r1,b2,r2,n1,n2,mode,rval,fl) \
(*(mp)->m_dm_ops.xfs_send_namesp)(ev,b1,r1,b2,r2,n1,n2,mode,rval,fl) (*(mp)->m_dm_ops.xfs_send_namesp)(ev,b1,r1,b2,r2,n1,n2,mode,rval,fl)
#define XFS_SEND_UNMOUNT(mp, vfsp,vp,right,mode,rval,fl) \ #define XFS_SEND_UNMOUNT(mp, vfsp,vp,right,mode,rval,fl) \
......
...@@ -1729,7 +1729,7 @@ xfs_inactive( ...@@ -1729,7 +1729,7 @@ xfs_inactive(
if (ip->i_d.di_nlink == 0 && if (ip->i_d.di_nlink == 0 &&
DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_DESTROY)) { DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_DESTROY)) {
(void) XFS_SEND_DESTROY(mp, bdp, DM_RIGHT_NULL); (void) XFS_SEND_DESTROY(mp, vp, DM_RIGHT_NULL);
} }
error = 0; error = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment