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

[XFS] kill xfs_iocore_t 



xfs_iocore_t is a structure embedded in xfs_inode. Except for one field it
just duplicates fields already in xfs_inode, and there is nothing this
abstraction buys us on XFS/Linux. This patch removes it and shrinks source
and binary size of xfs aswell as shrinking the size of xfs_inode by 60/44
bytes in debug/non-debug builds.

SGI-PV: 970852
SGI-Modid: xfs-linux-melb:xfs-kern:29754a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 007c61c6

fs/xfs/Makefile-linux-2.6

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ xfs-y += xfs_alloc.o \ 
				   xfs_iget.o \

				   xfs_inode.o \

				   xfs_inode_item.o \

				   xfs_iocore.o \

				   xfs_iomap.o \

				   xfs_itable.o \

				   xfs_dfrag.o \

fs/xfs/linux-2.6/xfs_aops.c

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ xfs_destroy_ioend( 
/*

 * Update on-disk file size now that data has been written to disk.

 * The current in-memory file size is i_size.  If a write is beyond

 * eof io_new_size will be the intended file size until i_size is

 * eof i_new_size will be the intended file size until i_size is

 * updated.  If this write does not extend all the way to the valid

 * file size then restrict this update to the end of the write.

 */
@@ -185,7 +185,7 @@ xfs_setfilesize( 


	xfs_ilock(ip, XFS_ILOCK_EXCL);



	isize = MAX(ip->i_size, ip->i_iocore.io_new_size);

	isize = MAX(ip->i_size, ip->i_new_size);

	isize = MIN(isize, bsize);



	if (ip->i_d.di_size < isize) {

fs/xfs/linux-2.6/xfs_lrw.c

+24 −31
Original line number Diff line number Diff line
@@ -58,14 +58,12 @@ 
void

xfs_rw_enter_trace(

	int			tag,

	xfs_iocore_t		*io,

	xfs_inode_t		*ip,

	void			*data,

	size_t			segs,

	loff_t			offset,

	int			ioflags)

{

	xfs_inode_t	*ip = XFS_IO_INODE(io);



	if (ip->i_rwtrace == NULL)

		return;

	ktrace_enter(ip->i_rwtrace,
@@ -78,8 +76,8 @@ xfs_rw_enter_trace( 
		(void *)((unsigned long)((offset >> 32) & 0xffffffff)),

		(void *)((unsigned long)(offset & 0xffffffff)),

		(void *)((unsigned long)ioflags),

		(void *)((unsigned long)((io->io_new_size >> 32) & 0xffffffff)),

		(void *)((unsigned long)(io->io_new_size & 0xffffffff)),

		(void *)((unsigned long)((ip->i_new_size >> 32) & 0xffffffff)),

		(void *)((unsigned long)(ip->i_new_size & 0xffffffff)),

		(void *)((unsigned long)current_pid()),

		(void *)NULL,

		(void *)NULL,
@@ -89,13 +87,12 @@ xfs_rw_enter_trace( 


void

xfs_inval_cached_trace(

	xfs_iocore_t	*io,

	xfs_inode_t	*ip,

	xfs_off_t	offset,

	xfs_off_t	len,

	xfs_off_t	first,

	xfs_off_t	last)

{

	xfs_inode_t	*ip = XFS_IO_INODE(io);



	if (ip->i_rwtrace == NULL)

		return;
@@ -256,7 +253,7 @@ xfs_read( 
		}

	}



	xfs_rw_enter_trace(XFS_READ_ENTER, &ip->i_iocore,

	xfs_rw_enter_trace(XFS_READ_ENTER, ip,

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



	iocb->ki_pos = *offset;
@@ -301,7 +298,7 @@ xfs_splice_read( 
			return -error;

		}

	}

	xfs_rw_enter_trace(XFS_SPLICE_READ_ENTER, &ip->i_iocore,

	xfs_rw_enter_trace(XFS_SPLICE_READ_ENTER, ip,

			   pipe, count, *ppos, ioflags);

	ret = generic_file_splice_read(infilp, ppos, pipe, count, flags);

	if (ret > 0)
@@ -323,7 +320,6 @@ xfs_splice_write( 
{

	bhv_vnode_t		*vp = XFS_ITOV(ip);

	xfs_mount_t		*mp = ip->i_mount;

	xfs_iocore_t		*io = &ip->i_iocore;

	ssize_t			ret;

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

	xfs_fsize_t		isize, new_size;
@@ -350,10 +346,10 @@ xfs_splice_write( 


	xfs_ilock(ip, XFS_ILOCK_EXCL);

	if (new_size > ip->i_size)

		io->io_new_size = new_size;

		ip->i_new_size = new_size;

	xfs_iunlock(ip, XFS_ILOCK_EXCL);



	xfs_rw_enter_trace(XFS_SPLICE_WRITE_ENTER, &ip->i_iocore,

	xfs_rw_enter_trace(XFS_SPLICE_WRITE_ENTER, ip,

			   pipe, count, *ppos, ioflags);

	ret = generic_file_splice_write(pipe, outfilp, ppos, count, flags);

	if (ret > 0)
@@ -370,9 +366,9 @@ xfs_splice_write( 
		xfs_iunlock(ip, XFS_ILOCK_EXCL);

	}



	if (io->io_new_size) {

	if (ip->i_new_size) {

		xfs_ilock(ip, XFS_ILOCK_EXCL);

		io->io_new_size = 0;

		ip->i_new_size = 0;

		if (ip->i_d.di_size > ip->i_size)

			ip->i_d.di_size = ip->i_size;

		xfs_iunlock(ip, XFS_ILOCK_EXCL);
@@ -461,20 +457,19 @@ xfs_zero_eof( 
	xfs_off_t	offset,		/* starting I/O offset */

	xfs_fsize_t	isize)		/* current inode size */

{

	xfs_iocore_t	*io = &ip->i_iocore;

	xfs_mount_t	*mp = ip->i_mount;

	xfs_fileoff_t	start_zero_fsb;

	xfs_fileoff_t	end_zero_fsb;

	xfs_fileoff_t	zero_count_fsb;

	xfs_fileoff_t	last_fsb;

	xfs_fileoff_t	zero_off;

	xfs_fsize_t	zero_len;

	xfs_mount_t	*mp = io->io_mount;

	int		nimaps;

	int		error = 0;

	xfs_bmbt_irec_t	imap;



	ASSERT(ismrlocked(io->io_lock, MR_UPDATE));

	ASSERT(ismrlocked(io->io_iolock, MR_UPDATE));

	ASSERT(ismrlocked(&ip->i_lock, MR_UPDATE));

	ASSERT(ismrlocked(&ip->i_iolock, MR_UPDATE));

	ASSERT(offset > isize);



	/*
@@ -483,8 +478,8 @@ xfs_zero_eof( 
	 */

	error = xfs_zero_last_block(ip, offset, isize);

	if (error) {

		ASSERT(ismrlocked(io->io_lock, MR_UPDATE));

		ASSERT(ismrlocked(io->io_iolock, MR_UPDATE));

		ASSERT(ismrlocked(&ip->i_lock, MR_UPDATE));

		ASSERT(ismrlocked(&ip->i_iolock, MR_UPDATE));

		return error;

	}
@@ -515,8 +510,8 @@ xfs_zero_eof( 
		error = xfs_bmapi(NULL, ip, start_zero_fsb, zero_count_fsb,

				  0, NULL, 0, &imap, &nimaps, NULL, NULL);

		if (error) {

			ASSERT(ismrlocked(io->io_lock, MR_UPDATE));

			ASSERT(ismrlocked(io->io_iolock, MR_UPDATE));

			ASSERT(ismrlocked(&ip->i_lock, MR_UPDATE));

			ASSERT(ismrlocked(&ip->i_iolock, MR_UPDATE));

			return error;

		}

		ASSERT(nimaps > 0);
@@ -584,7 +579,6 @@ xfs_write( 
	xfs_mount_t		*mp;

	ssize_t			ret = 0, error = 0;

	xfs_fsize_t		isize, new_size;

	xfs_iocore_t		*io;

	int			iolock;

	int			eventsent = 0;

	bhv_vrwlock_t		locktype;
@@ -604,8 +598,7 @@ xfs_write( 
	if (count == 0)

		return 0;



	io = &xip->i_iocore;

	mp = io->io_mount;

	mp = xip->i_mount;



	xfs_wait_for_freeze(mp, SB_FREEZE_WRITE);
@@ -685,7 +678,7 @@ start: 


	new_size = pos + count;

	if (new_size > xip->i_size)

		io->io_new_size = new_size;

		xip->i_new_size = new_size;



	if (likely(!(ioflags & IO_INVIS))) {

		file_update_time(file);
@@ -737,7 +730,7 @@ retry: 
	if ((ioflags & IO_ISDIRECT)) {

		if (VN_CACHED(vp)) {

			WARN_ON(need_i_mutex == 0);

			xfs_inval_cached_trace(io, pos, -1,

			xfs_inval_cached_trace(xip, pos, -1,

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

			error = xfs_flushinval_pages(xip,

					ctooff(offtoct(pos)),
@@ -756,7 +749,7 @@ retry: 
			need_i_mutex = 0;

		}



 		xfs_rw_enter_trace(XFS_DIOWR_ENTER, io, (void *)iovp, segs,

 		xfs_rw_enter_trace(XFS_DIOWR_ENTER, xip, (void *)iovp, segs,

				*offset, ioflags);

		ret = generic_file_direct_write(iocb, iovp,

				&segs, pos, offset, count, ocount);
@@ -776,7 +769,7 @@ retry: 
			goto relock;

		}

	} else {

		xfs_rw_enter_trace(XFS_WRITE_ENTER, io, (void *)iovp, segs,

		xfs_rw_enter_trace(XFS_WRITE_ENTER, xip, (void *)iovp, segs,

				*offset, ioflags);

		ret = generic_file_buffered_write(iocb, iovp, segs,

				pos, offset, count, ret);
@@ -840,9 +833,9 @@ retry: 
	}



 out_unlock_internal:

	if (io->io_new_size) {

	if (xip->i_new_size) {

		xfs_ilock(xip, XFS_ILOCK_EXCL);

		io->io_new_size = 0;

		xip->i_new_size = 0;

		/*

		 * If this was a direct or synchronous I/O that failed (such

		 * as ENOSPC) then part of the I/O may have been written to

fs/xfs/linux-2.6/xfs_lrw.h

+6 −7
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#define __XFS_LRW_H__



struct xfs_mount;

struct xfs_iocore;

struct xfs_inode;

struct xfs_bmbt_irec;

struct xfs_buf;
@@ -60,13 +59,13 @@ struct xfs_iomap; 
#define	XFS_IOMAP_UNWRITTEN	27

#define XFS_SPLICE_READ_ENTER	28

#define XFS_SPLICE_WRITE_ENTER	29

extern void xfs_rw_enter_trace(int, struct xfs_iocore *,

extern void xfs_rw_enter_trace(int, struct xfs_inode *,

		void *, size_t, loff_t, int);

extern void xfs_inval_cached_trace(struct xfs_iocore *,

extern void xfs_inval_cached_trace(struct xfs_inode *,

		xfs_off_t, xfs_off_t, xfs_off_t, xfs_off_t);

#else

#define xfs_rw_enter_trace(tag, io, data, size, offset, ioflags)

#define xfs_inval_cached_trace(io, offset, len, first, last)

#define xfs_rw_enter_trace(tag, ip, data, size, offset, ioflags)

#define xfs_inval_cached_trace(ip, offset, len, first, last)

#endif



extern int xfsbdstrat(struct xfs_mount *, struct xfs_buf *);

fs/xfs/xfs_dfrag.c

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



	if (VN_CACHED(tvp) != 0) {

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

		xfs_inval_cached_trace(tip, 0, -1, 0, -1);

		error = xfs_flushinval_pages(tip, 0, -1,

				FI_REMAPF_LOCKED);

		if (error)

CRA Git | Maintained and supported by SUSTech CRA and CCSE