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

Commit a78feb7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Avoid replaying inode buffer initialisation log items if on-disk version is newer.
  [XFS] Ensure file size updates have been completed before writing inode to disk.
  [XFS] On-demand reaping of the MRU cache
parents 91fe7d7c b394e43e

fs/xfs/linux-2.6/xfs_aops.c

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ xfs_setfilesize( 
		ip->i_d.di_size = isize;

		ip->i_update_core = 1;

		ip->i_update_size = 1;

		mark_inode_dirty_sync(vn_to_inode(ioend->io_vnode));

	}



	xfs_iunlock(ip, XFS_ILOCK_EXCL);

fs/xfs/linux-2.6/xfs_super.c

+3 −1
Original line number Diff line number Diff line
@@ -415,8 +415,10 @@ xfs_fs_write_inode( 


	if (vp) {

		vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);

		if (sync)

		if (sync) {

			filemap_fdatawait(inode->i_mapping);

			flags |= FLUSH_SYNC;

		}

		error = bhv_vop_iflush(vp, flags);

		if (error == EAGAIN)

			error = sync? bhv_vop_iflush(vp, flags | FLUSH_LOG) : 0;

fs/xfs/xfs_buf_item.h

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,11 @@ typedef struct xfs_buf_log_format_t { 
#define	XFS_BLI_UDQUOT_BUF	0x4

#define XFS_BLI_PDQUOT_BUF	0x8

#define	XFS_BLI_GDQUOT_BUF	0x10

/*

 * This flag indicates that the buffer contains newly allocated

 * inodes.

 */

#define	XFS_BLI_INODE_NEW_BUF	0x20



#define	XFS_BLI_CHUNK		128

#define	XFS_BLI_SHIFT		7

fs/xfs/xfs_filestream.c

+1 −2
Original line number Diff line number Diff line
@@ -467,8 +467,7 @@ void 
xfs_filestream_flush(

	xfs_mount_t	*mp)

{

	/* point in time flush, so keep the reaper running */

	xfs_mru_cache_flush(mp->m_filestream, 1);

	xfs_mru_cache_flush(mp->m_filestream);

}



/*

fs/xfs/xfs_log_recover.c

+48 −3
Original line number Diff line number Diff line
@@ -1874,6 +1874,7 @@ xlog_recover_do_inode_buffer( 
/*ARGSUSED*/

STATIC void

xlog_recover_do_reg_buffer(

	xfs_mount_t		*mp,

	xlog_recover_item_t	*item,

	xfs_buf_t		*bp,

	xfs_buf_log_format_t	*buf_f)
@@ -1884,6 +1885,50 @@ xlog_recover_do_reg_buffer( 
	unsigned int		*data_map = NULL;

	unsigned int		map_size = 0;

	int                     error;

	int			stale_buf = 1;



	/*

	 * Scan through the on-disk inode buffer and attempt to

	 * determine if it has been written to since it was logged.

	 *

	 * - If any of the magic numbers are incorrect then the buffer is stale

	 * - If any of the modes are non-zero then the buffer is not stale

	 * - If all of the modes are zero and at least one of the generation

	 *   counts is non-zero then the buffer is stale

	 *

	 * If the end result is a stale buffer then the log buffer is replayed

	 * otherwise it is skipped.

	 *

	 * This heuristic is not perfect.  It can be improved by scanning the

	 * entire inode chunk for evidence that any of the inode clusters have

	 * been updated.  To fix this problem completely we will need a major

	 * architectural change to the logging system.

	 */

	if (buf_f->blf_flags & XFS_BLI_INODE_NEW_BUF) {

		xfs_dinode_t    *dip;

		int             inodes_per_buf;

		int		mode_count = 0;

		int		gen_count = 0;



		stale_buf = 0;

		inodes_per_buf = XFS_BUF_COUNT(bp) >> mp->m_sb.sb_inodelog;

		for (i = 0; i < inodes_per_buf; i++) {

			dip = (xfs_dinode_t *)xfs_buf_offset(bp,

				i * mp->m_sb.sb_inodesize);

			if (be16_to_cpu(dip->di_core.di_magic) !=

					XFS_DINODE_MAGIC) {

				stale_buf = 1;

				break;

			}

			if (be16_to_cpu(dip->di_core.di_mode))

				mode_count++;

			if (be16_to_cpu(dip->di_core.di_gen))

				gen_count++;

		}



		if (!mode_count && gen_count)

			stale_buf = 1;

	}



	switch (buf_f->blf_type) {

	case XFS_LI_BUF:
@@ -1917,7 +1962,7 @@ xlog_recover_do_reg_buffer( 
					       -1, 0, XFS_QMOPT_DOWARN,

					       "dquot_buf_recover");

		}

		if (!error)

		if (!error && stale_buf)

			memcpy(xfs_buf_offset(bp,

				(uint)bit << XFS_BLI_SHIFT),	/* dest */

				item->ri_buf[i].i_addr,		/* source */
@@ -2089,7 +2134,7 @@ xlog_recover_do_dquot_buffer( 
	if (log->l_quotaoffs_flag & type)

		return;



	xlog_recover_do_reg_buffer(item, bp, buf_f);

	xlog_recover_do_reg_buffer(mp, item, bp, buf_f);

}



/*
@@ -2190,7 +2235,7 @@ xlog_recover_do_buffer_trans( 
		  (XFS_BLI_UDQUOT_BUF|XFS_BLI_PDQUOT_BUF|XFS_BLI_GDQUOT_BUF)) {

		xlog_recover_do_dquot_buffer(mp, log, item, bp, buf_f);

	} else {

		xlog_recover_do_reg_buffer(item, bp, buf_f);

		xlog_recover_do_reg_buffer(mp, item, bp, buf_f);

	}

	if (error)

		return XFS_ERROR(error);