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

Commit edcd4bce authored by Nathan Scott's avatar Nathan Scott Committed by Tim Shimmin
Browse files

[XFS] Minor cleanup from dio locking fix, remove an extra conditional. 



SGI-PV: 955696
SGI-Modid: xfs-linux-melb:xfs-kern:26908a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 215101c3

fs/xfs/linux-2.6/xfs_lrw.c

+5 −5
Original line number Diff line number Diff line
@@ -270,12 +270,12 @@ xfs_read( 
		}

	}



	if (unlikely((ioflags & IO_ISDIRECT) && VN_CACHED(vp)))

	if (unlikely(ioflags & IO_ISDIRECT)) {

		if (VN_CACHED(vp))

			bhv_vop_flushinval_pages(vp, ctooff(offtoct(*offset)),

						 -1, FI_REMAPF_LOCKED);



	if (unlikely(ioflags & IO_ISDIRECT))

		mutex_unlock(&inode->i_mutex);

	}



	xfs_rw_enter_trace(XFS_READ_ENTER, &ip->i_iocore,

				(void *)iovp, segs, *offset, ioflags);