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

Commit eb9df39d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tim Shimmin
Browse files

[XFS] remove unessecary vfs argument to DM_EVENT_ENABLED 



SGI-PV: 968690
SGI-Modid: xfs-linux-melb:xfs-kern:29340a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarVlad Apostolov <vapo@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 49ee6c91

fs/xfs/linux-2.6/xfs_file.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ xfs_file_open_exec( 


		if (!ip)

			return -EINVAL;

		if (DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_READ))

		if (DM_EVENT_ENABLED(ip, DM_EVENT_READ))

			return -XFS_SEND_DATA(mp, DM_EVENT_READ, vp,

					       0, 0, 0, NULL);

	}

fs/xfs/linux-2.6/xfs_lrw.c

+6 −11
Original line number Diff line number Diff line
@@ -245,8 +245,7 @@ xfs_read( 
		mutex_lock(&inode->i_mutex);

	xfs_ilock(ip, XFS_IOLOCK_SHARED);



	if (DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_READ) &&

	    !(ioflags & IO_INVIS)) {

	if (DM_EVENT_ENABLED(ip, DM_EVENT_READ) && !(ioflags & IO_INVIS)) {

		bhv_vrwlock_t locktype = VRWLOCK_READ;

		int dmflags = FILP_DELAY_FLAG(file) | DM_SEM_FLAG_RD(ioflags);
@@ -307,8 +306,7 @@ xfs_splice_read( 


	xfs_ilock(ip, XFS_IOLOCK_SHARED);



	if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_READ) &&

	    (!(ioflags & IO_INVIS))) {

	if (DM_EVENT_ENABLED(ip, DM_EVENT_READ) && !(ioflags & IO_INVIS)) {

		bhv_vrwlock_t locktype = VRWLOCK_READ;

		int error;
@@ -354,8 +352,7 @@ xfs_splice_write( 


	xfs_ilock(ip, XFS_IOLOCK_EXCL);



	if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_WRITE) &&

	    (!(ioflags & IO_INVIS))) {

	if (DM_EVENT_ENABLED(ip, DM_EVENT_WRITE) && !(ioflags & IO_INVIS)) {

		bhv_vrwlock_t locktype = VRWLOCK_WRITE;

		int error;
@@ -664,7 +661,7 @@ xfs_write( 
		goto out_unlock_mutex;

	}



	if ((DM_EVENT_ENABLED(vp->v_vfsp, xip, DM_EVENT_WRITE) &&

	if ((DM_EVENT_ENABLED(xip, DM_EVENT_WRITE) &&

	    !(ioflags & IO_INVIS) && !eventsent)) {

		int		dmflags = FILP_DELAY_FLAG(file);
@@ -816,10 +813,8 @@ xfs_write( 
	if (ret == -EIOCBQUEUED && !(ioflags & IO_ISAIO))

		ret = wait_on_sync_kiocb(iocb);



	if ((ret == -ENOSPC) &&

	    DM_EVENT_ENABLED(vp->v_vfsp, xip, DM_EVENT_NOSPACE) &&

	    !(ioflags & IO_INVIS)) {



	if (ret == -ENOSPC &&

	    DM_EVENT_ENABLED(xip, DM_EVENT_NOSPACE) && !(ioflags & IO_INVIS)) {

		xfs_rwunlock(bdp, locktype);

		if (need_i_mutex)

			mutex_unlock(&inode->i_mutex);

fs/xfs/xfs_bmap.c

+3 −4
Original line number Diff line number Diff line
@@ -5811,10 +5811,9 @@ xfs_getbmap( 
	 *	could misinterpret holes in a DMAPI file as true holes,

	 *	when in fact they may represent offline user data.

	 */

	if (   (interface & BMV_IF_NO_DMAPI_READ) == 0

	    && DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_READ)

	    && whichfork == XFS_DATA_FORK) {



	if ((interface & BMV_IF_NO_DMAPI_READ) == 0 &&

	    DM_EVENT_ENABLED(ip, DM_EVENT_READ) &&

	    whichfork == XFS_DATA_FORK) {

		error = XFS_SEND_DATA(mp, DM_EVENT_READ, vp, 0, 0, 0, NULL);

		if (error)

			return XFS_ERROR(error);

fs/xfs/xfs_dmapi.h

+2 −8
Original line number Diff line number Diff line
@@ -67,18 +67,12 @@ typedef enum { 
#define HAVE_DM_RIGHT_T



/* Defines for determining if an event message should be sent. */

#define	DM_EVENT_ENABLED(vfsp, ip, event) ( \

	unlikely ((vfsp)->vfs_flag & VFS_DMI) && \

#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)) ) \

	)



#define	DM_EVENT_ENABLED_IO(vfsp, io, event) ( \

	unlikely ((vfsp)->vfs_flag & VFS_DMI) && \

		( ((io)->io_dmevmask & (1 << event)) || \

		  ((io)->io_mount->m_dmevmask & (1 << event)) ) \

	)



#define DM_XFS_VALID_FS_EVENTS		( \

	(1 << DM_EVENT_PREUNMOUNT)	| \

	(1 << DM_EVENT_UNMOUNT)		| \

fs/xfs/xfs_rename.c

+4 −6
Original line number Diff line number Diff line
@@ -264,9 +264,8 @@ xfs_rename( 
	src_dp = XFS_BHVTOI(src_dir_bdp);

	mp = src_dp->i_mount;



	if (DM_EVENT_ENABLED(src_dir_vp->v_vfsp, src_dp, DM_EVENT_RENAME) ||

	    DM_EVENT_ENABLED(target_dir_vp->v_vfsp,

				target_dp, DM_EVENT_RENAME)) {

	if (DM_EVENT_ENABLED(src_dp, DM_EVENT_RENAME) ||

	    DM_EVENT_ENABLED(target_dp, DM_EVENT_RENAME)) {

		error = XFS_SEND_NAMESP(mp, DM_EVENT_RENAME,

					src_dir_vp, DM_RIGHT_NULL,

					target_dir_vp, DM_RIGHT_NULL,
@@ -603,9 +602,8 @@ xfs_rename( 
	/* Fall through to std_return with error = 0 or errno from

	 * xfs_trans_commit	 */

std_return:

	if (DM_EVENT_ENABLED(src_dir_vp->v_vfsp, src_dp, DM_EVENT_POSTRENAME) ||

	    DM_EVENT_ENABLED(target_dir_vp->v_vfsp,

				target_dp, DM_EVENT_POSTRENAME)) {

	if (DM_EVENT_ENABLED(src_dp, DM_EVENT_POSTRENAME) ||

	    DM_EVENT_ENABLED(target_dp, DM_EVENT_POSTRENAME)) {

		(void) XFS_SEND_NAMESP (mp, DM_EVENT_POSTRENAME,

					src_dir_vp, DM_RIGHT_NULL,

					target_dir_vp, DM_RIGHT_NULL,