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

Commit fb595814 authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

xfs: remove xfs_flushinval_pages 



It's just a simple wrapper around VFS functionality, and is actually
bugging in that it doesn't remove mappings before invalidating the
page cache. Remove it and replace it with the correct VFS
functionality.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarAndrew Dahl <adahl@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 4bc1ea6b

fs/xfs/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ xfs-y += xfs_aops.o \ 
				   xfs_file.o \

				   xfs_filestream.o \

				   xfs_fsops.o \

				   xfs_fs_subr.o \

				   xfs_globals.o \

				   xfs_icache.o \

				   xfs_ioctl.o \

fs/xfs/xfs_dfrag.c

+4 −6
Original line number Diff line number Diff line
@@ -246,12 +246,10 @@ xfs_swap_extents( 
		goto out_unlock;

	}



	if (VN_CACHED(VFS_I(tip)) != 0) {

		error = xfs_flushinval_pages(tip, 0, -1,

				FI_REMAPF_LOCKED);

	error = -filemap_write_and_wait(VFS_I(ip)->i_mapping);

	if (error)

		goto out_unlock;

	}

	truncate_pagecache_range(VFS_I(ip), 0, -1);



	/* Verify O_DIRECT for ftmp */

	if (VN_CACHED(VFS_I(tip)) != 0) {

fs/xfs/xfs_file.c

+12 −11
Original line number Diff line number Diff line
@@ -255,15 +255,14 @@ xfs_file_aio_read( 
		xfs_buftarg_t	*target =

			XFS_IS_REALTIME_INODE(ip) ?

				mp->m_rtdev_targp : mp->m_ddev_targp;

		if ((iocb->ki_pos & target->bt_smask) ||

		    (size & target->bt_smask)) {

			if (iocb->ki_pos == i_size_read(inode))

		if ((pos & target->bt_smask) || (size & target->bt_smask)) {

			if (pos == i_size_read(inode))

				return 0;

			return -XFS_ERROR(EINVAL);

		}

	}



	n = mp->m_super->s_maxbytes - iocb->ki_pos;

	n = mp->m_super->s_maxbytes - pos;

	if (n <= 0 || size == 0)

		return 0;
@@ -289,20 +288,21 @@ xfs_file_aio_read( 
		xfs_rw_ilock(ip, XFS_IOLOCK_EXCL);



		if (inode->i_mapping->nrpages) {

			ret = -xfs_flushinval_pages(ip,

					(iocb->ki_pos & PAGE_CACHE_MASK),

					-1, FI_REMAPF_LOCKED);

			ret = -filemap_write_and_wait_range(

							VFS_I(ip)->i_mapping,

							pos, -1);

			if (ret) {

				xfs_rw_iunlock(ip, XFS_IOLOCK_EXCL);

				return ret;

			}

			truncate_pagecache_range(VFS_I(ip), pos, -1);

		}

		xfs_rw_ilock_demote(ip, XFS_IOLOCK_EXCL);

	}



	trace_xfs_file_read(ip, size, iocb->ki_pos, ioflags);

	trace_xfs_file_read(ip, size, pos, ioflags);



	ret = generic_file_aio_read(iocb, iovp, nr_segs, iocb->ki_pos);

	ret = generic_file_aio_read(iocb, iovp, nr_segs, pos);

	if (ret > 0)

		XFS_STATS_ADD(xs_read_bytes, ret);
@@ -670,10 +670,11 @@ xfs_file_dio_aio_write( 
		goto out;



	if (mapping->nrpages) {

		ret = -xfs_flushinval_pages(ip, (pos & PAGE_CACHE_MASK), -1,

							FI_REMAPF_LOCKED);

		ret = -filemap_write_and_wait_range(VFS_I(ip)->i_mapping,

						    pos, -1);

		if (ret)

			goto out;

		truncate_pagecache_range(VFS_I(ip), pos, -1);

	}



	/*

fs/xfs/xfs_fs_subr.c

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2000-2002,2005-2006 Silicon Graphics, Inc.

 * All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it would be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write the Free Software Foundation,

 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#include "xfs.h"

#include "xfs_vnodeops.h"

#include "xfs_bmap_btree.h"

#include "xfs_inode.h"

#include "xfs_trace.h"



/*

 * note: all filemap functions return negative error codes. These

 * need to be inverted before returning to the xfs core functions.

 */

int

xfs_flushinval_pages(

	xfs_inode_t	*ip,

	xfs_off_t	first,

	xfs_off_t	last,

	int		fiopt)

{

	struct address_space *mapping = VFS_I(ip)->i_mapping;

	int		ret = 0;



	trace_xfs_pagecache_inval(ip, first, last);



	xfs_iflags_clear(ip, XFS_ITRUNCATED);

	ret = filemap_write_and_wait_range(mapping, first,

				last == -1 ? LLONG_MAX : last);

	if (!ret)

		truncate_inode_pages_range(mapping, first, last);

	return -ret;

}

fs/xfs/xfs_vnodeops.c

+5 −6
Original line number Diff line number Diff line
@@ -1958,12 +1958,11 @@ xfs_free_file_space( 


	rounding = max_t(uint, 1 << mp->m_sb.sb_blocklog, PAGE_CACHE_SIZE);

	ioffset = offset & ~(rounding - 1);



	if (VN_CACHED(VFS_I(ip)) != 0) {

		error = xfs_flushinval_pages(ip, ioffset, -1, FI_REMAPF_LOCKED);

	error = -filemap_write_and_wait_range(VFS_I(ip)->i_mapping,

					      ioffset, -1);

	if (error)

		goto out_unlock_iolock;

	}

	truncate_pagecache_range(VFS_I(ip), ioffset, -1);



	/*

	 * Need to zero the stuff we're not freeing, on disk.