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

Commit dcf49cc5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[XFS] cleanup vnode use in xfs_lrw.c 



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

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent ef1f5e7a

fs/xfs/linux-2.6/xfs_lrw.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -176,7 +176,6 @@ xfs_read( 
{

{

	struct file		*file = iocb->ki_filp;

	struct file		*file = iocb->ki_filp;

	struct inode		*inode = file->f_mapping->host;

	struct inode		*inode = file->f_mapping->host;

	bhv_vnode_t		*vp = XFS_ITOV(ip);

	xfs_mount_t		*mp = ip->i_mount;

	xfs_mount_t		*mp = ip->i_mount;

	size_t			size = 0;

	size_t			size = 0;

	ssize_t			ret = 0;

	ssize_t			ret = 0;
@@ -242,7 +241,7 @@ xfs_read( 
	}

	}





	if (unlikely(ioflags & IO_ISDIRECT)) {

	if (unlikely(ioflags & IO_ISDIRECT)) {

		if (VN_CACHED(vp))

		if (inode->i_mapping->nrpages)

			ret = xfs_flushinval_pages(ip, (*offset & PAGE_CACHE_MASK),

			ret = xfs_flushinval_pages(ip, (*offset & PAGE_CACHE_MASK),

						    -1, FI_REMAPF_LOCKED);

						    -1, FI_REMAPF_LOCKED);

		mutex_unlock(&inode->i_mutex);

		mutex_unlock(&inode->i_mutex);
@@ -571,7 +570,6 @@ xfs_write( 
	struct file		*file = iocb->ki_filp;

	struct file		*file = iocb->ki_filp;

	struct address_space	*mapping = file->f_mapping;

	struct address_space	*mapping = file->f_mapping;

	struct inode		*inode = mapping->host;

	struct inode		*inode = mapping->host;

	bhv_vnode_t		*vp = XFS_ITOV(xip);

	unsigned long		segs = nsegs;

	unsigned long		segs = nsegs;

	xfs_mount_t		*mp;

	xfs_mount_t		*mp;

	ssize_t			ret = 0, error = 0;

	ssize_t			ret = 0, error = 0;
@@ -658,7 +656,7 @@ xfs_write( 
			return XFS_ERROR(-EINVAL);

			return XFS_ERROR(-EINVAL);

		}

		}





		if (!need_i_mutex && (VN_CACHED(vp) || pos > xip->i_size)) {

		if (!need_i_mutex && (mapping->nrpages || pos > xip->i_size)) {

			xfs_iunlock(xip, XFS_ILOCK_EXCL|iolock);

			xfs_iunlock(xip, XFS_ILOCK_EXCL|iolock);

			iolock = XFS_IOLOCK_EXCL;

			iolock = XFS_IOLOCK_EXCL;

			need_i_mutex = 1;

			need_i_mutex = 1;
@@ -720,7 +718,7 @@ xfs_write( 
	current->backing_dev_info = mapping->backing_dev_info;

	current->backing_dev_info = mapping->backing_dev_info;





	if ((ioflags & IO_ISDIRECT)) {

	if ((ioflags & IO_ISDIRECT)) {

		if (VN_CACHED(vp)) {

		if (mapping->nrpages) {

			WARN_ON(need_i_mutex == 0);

			WARN_ON(need_i_mutex == 0);

			xfs_inval_cached_trace(xip, pos, -1,

			xfs_inval_cached_trace(xip, pos, -1,

					(pos & PAGE_CACHE_MASK), -1);

					(pos & PAGE_CACHE_MASK), -1);