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

Commit d3cf2094 authored by Lachlan McIlroy's avatar Lachlan McIlroy Committed by Tim Shimmin
Browse files

[XFS] propogate return codes from flush routines 



This patch handles error return values in fs_flush_pages and
fs_flushinval_pages. It changes the prototype of fs_flushinval_pages so we
can propogate the errors and handle them at higher layers. I also modified
xfs_itruncate_start so that it could propogate the error further.

SGI-PV: 961990
SGI-Modid: xfs-linux-melb:xfs-kern:28231a

Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarStewart Smith <stewart@flamingspork.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 424ea91b

fs/xfs/linux-2.6/xfs_fs_subr.c

+14 −7
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ fs_tosspages( 
		truncate_inode_pages(ip->i_mapping, first);

		truncate_inode_pages(ip->i_mapping, first);

}

}





void

int

fs_flushinval_pages(

fs_flushinval_pages(

	bhv_desc_t	*bdp,

	bhv_desc_t	*bdp,

	xfs_off_t	first,

	xfs_off_t	first,
@@ -44,13 +44,16 @@ fs_flushinval_pages( 
{

{

	bhv_vnode_t	*vp = BHV_TO_VNODE(bdp);

	bhv_vnode_t	*vp = BHV_TO_VNODE(bdp);

	struct inode	*ip = vn_to_inode(vp);

	struct inode	*ip = vn_to_inode(vp);

	int		ret = 0;





	if (VN_CACHED(vp)) {

	if (VN_CACHED(vp)) {

		if (VN_TRUNC(vp))

		if (VN_TRUNC(vp))

			VUNTRUNCATE(vp);

			VUNTRUNCATE(vp);

		filemap_write_and_wait(ip->i_mapping);

		ret = filemap_write_and_wait(ip->i_mapping);

		if (!ret)

			truncate_inode_pages(ip->i_mapping, first);

			truncate_inode_pages(ip->i_mapping, first);

	}

	}

	return ret;

}

}





int

int
@@ -63,14 +66,18 @@ fs_flush_pages( 
{

{

	bhv_vnode_t	*vp = BHV_TO_VNODE(bdp);

	bhv_vnode_t	*vp = BHV_TO_VNODE(bdp);

	struct inode	*ip = vn_to_inode(vp);

	struct inode	*ip = vn_to_inode(vp);

	int		ret = 0;

	int		ret2;





	if (VN_DIRTY(vp)) {

	if (VN_DIRTY(vp)) {

		if (VN_TRUNC(vp))

		if (VN_TRUNC(vp))

			VUNTRUNCATE(vp);

			VUNTRUNCATE(vp);

		filemap_fdatawrite(ip->i_mapping);

		ret = filemap_fdatawrite(ip->i_mapping);

		if (flags & XFS_B_ASYNC)

		if (flags & XFS_B_ASYNC)

			return 0;

			return ret;

		filemap_fdatawait(ip->i_mapping);

		ret2 = filemap_fdatawait(ip->i_mapping);

		if (!ret)

			ret = ret2;

	}

	}

	return 0;

	return ret;

}
 
}

fs/xfs/linux-2.6/xfs_fs_subr.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ extern int fs_noerr(void); 
extern int  fs_nosys(void);

extern int  fs_nosys(void);

extern void fs_noval(void);

extern void fs_noval(void);

extern void fs_tosspages(bhv_desc_t *, xfs_off_t, xfs_off_t, int);

extern void fs_tosspages(bhv_desc_t *, xfs_off_t, xfs_off_t, int);

extern void fs_flushinval_pages(bhv_desc_t *, xfs_off_t, xfs_off_t, int);

extern int  fs_flushinval_pages(bhv_desc_t *, xfs_off_t, xfs_off_t, int);

extern int  fs_flush_pages(bhv_desc_t *, xfs_off_t, xfs_off_t, uint64_t, int);

extern int  fs_flush_pages(bhv_desc_t *, xfs_off_t, xfs_off_t, uint64_t, int);





#endif	/* __XFS_FS_SUBR_H__ */
 
#endif	/* __XFS_FS_SUBR_H__ */

fs/xfs/linux-2.6/xfs_lrw.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -191,7 +191,7 @@ 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;

	size_t			size = 0;

	size_t			size = 0;

	ssize_t			ret;

	ssize_t			ret = 0;

	xfs_fsize_t		n;

	xfs_fsize_t		n;

	xfs_inode_t		*ip;

	xfs_inode_t		*ip;

	xfs_mount_t		*mp;

	xfs_mount_t		*mp;
@@ -263,9 +263,13 @@ xfs_read( 




	if (unlikely(ioflags & IO_ISDIRECT)) {

	if (unlikely(ioflags & IO_ISDIRECT)) {

		if (VN_CACHED(vp))

		if (VN_CACHED(vp))

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

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

						 -1, FI_REMAPF_LOCKED);

						 -1, FI_REMAPF_LOCKED);

		mutex_unlock(&inode->i_mutex);

		mutex_unlock(&inode->i_mutex);

		if (ret) {

			xfs_iunlock(ip, XFS_IOLOCK_SHARED);

			return ret;

		}

	}

	}





	xfs_rw_enter_trace(XFS_READ_ENTER, &ip->i_iocore,

	xfs_rw_enter_trace(XFS_READ_ENTER, &ip->i_iocore,
@@ -814,8 +818,10 @@ xfs_write( 
		if (need_flush) {

		if (need_flush) {

			xfs_inval_cached_trace(io, pos, -1,

			xfs_inval_cached_trace(io, pos, -1,

					ctooff(offtoct(pos)), -1);

					ctooff(offtoct(pos)), -1);

			bhv_vop_flushinval_pages(vp, ctooff(offtoct(pos)),

			error = bhv_vop_flushinval_pages(vp, ctooff(offtoct(pos)),

					-1, FI_REMAPF_LOCKED);

					-1, FI_REMAPF_LOCKED);

			if (error)

				goto out_unlock_internal;

		}

		}





		if (need_i_mutex) {

		if (need_i_mutex) {

fs/xfs/linux-2.6/xfs_vnode.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -194,7 +194,7 @@ typedef int (*vop_attr_list_t)(bhv_desc_t *, char *, int, int, 
typedef void	(*vop_link_removed_t)(bhv_desc_t *, bhv_vnode_t *, int);

typedef void	(*vop_link_removed_t)(bhv_desc_t *, bhv_vnode_t *, int);

typedef void	(*vop_vnode_change_t)(bhv_desc_t *, bhv_vchange_t, __psint_t);

typedef void	(*vop_vnode_change_t)(bhv_desc_t *, bhv_vchange_t, __psint_t);

typedef void	(*vop_ptossvp_t)(bhv_desc_t *, xfs_off_t, xfs_off_t, int);

typedef void	(*vop_ptossvp_t)(bhv_desc_t *, xfs_off_t, xfs_off_t, int);

typedef void	(*vop_pflushinvalvp_t)(bhv_desc_t *, xfs_off_t, xfs_off_t, int);

typedef int	(*vop_pflushinvalvp_t)(bhv_desc_t *, xfs_off_t, xfs_off_t, int);

typedef int	(*vop_pflushvp_t)(bhv_desc_t *, xfs_off_t, xfs_off_t,

typedef int	(*vop_pflushvp_t)(bhv_desc_t *, xfs_off_t, xfs_off_t,

				uint64_t, int);

				uint64_t, int);

typedef int	(*vop_iflush_t)(bhv_desc_t *, int);

typedef int	(*vop_iflush_t)(bhv_desc_t *, int);

fs/xfs/xfs_dfrag.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -199,7 +199,9 @@ xfs_swap_extents( 




	if (VN_CACHED(tvp) != 0) {

	if (VN_CACHED(tvp) != 0) {

		xfs_inval_cached_trace(&tip->i_iocore, 0, -1, 0, -1);

		xfs_inval_cached_trace(&tip->i_iocore, 0, -1, 0, -1);

		bhv_vop_flushinval_pages(tvp, 0, -1, FI_REMAPF_LOCKED);

		error = bhv_vop_flushinval_pages(tvp, 0, -1, FI_REMAPF_LOCKED);

		if (error)

			goto error0;

	}

	}





	/* Verify O_DIRECT for ftmp */

	/* Verify O_DIRECT for ftmp */