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

Commit 2b93681f authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next 

Conflicts:
	fs/xfs/libxfs/xfs_bmap.c
	fs/xfs/xfs_inode.c
parents d41bb034 5e9383f9

fs/xfs/libxfs/xfs_bmap.c

+0 −32
Original line number Diff line number Diff line
@@ -244,30 +244,6 @@ xfs_bmap_forkoff_reset( 
	}

}



/*

 * Debug/sanity checking code

 */



STATIC int

xfs_bmap_sanity_check(

	struct xfs_mount	*mp,

	struct xfs_buf		*bp,

	int			level)

{

	struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);



	if (block->bb_magic != cpu_to_be32(XFS_BMAP_CRC_MAGIC) &&

	    block->bb_magic != cpu_to_be32(XFS_BMAP_MAGIC))

		return 0;



	if (be16_to_cpu(block->bb_level) != level ||

	    be16_to_cpu(block->bb_numrecs) == 0 ||

	    be16_to_cpu(block->bb_numrecs) > mp->m_bmap_dmxr[level != 0])

		return 0;



	return 1;

}



#ifdef DEBUG

STATIC struct xfs_buf *

xfs_bmap_get_bp(
@@ -410,9 +386,6 @@ xfs_bmap_check_leaf_extents( 
				goto error_norelse;

		}

		block = XFS_BUF_TO_BLOCK(bp);

		XFS_WANT_CORRUPTED_GOTO(mp,

			xfs_bmap_sanity_check(mp, bp, level),

			error0);

		if (level == 0)

			break;
@@ -1312,8 +1285,6 @@ xfs_bmap_read_extents( 
		if (error)

			return error;

		block = XFS_BUF_TO_BLOCK(bp);

		XFS_WANT_CORRUPTED_GOTO(mp,

			xfs_bmap_sanity_check(mp, bp, level), error0);

		if (level == 0)

			break;

		pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[1]);
@@ -1346,9 +1317,6 @@ xfs_bmap_read_extents( 
				XFS_ERRLEVEL_LOW, ip->i_mount, block);

			goto error0;

		}

		XFS_WANT_CORRUPTED_GOTO(mp,

			xfs_bmap_sanity_check(mp, bp, 0),

			error0);

		/*

		 * Read-ahead the next leaf block, if any.

		 */

fs/xfs/libxfs/xfs_da_btree.c

+4 −4
Original line number Diff line number Diff line
@@ -538,12 +538,12 @@ xfs_da3_root_split( 
	oldroot = blk1->bp->b_addr;

	if (oldroot->hdr.info.magic == cpu_to_be16(XFS_DA_NODE_MAGIC) ||

	    oldroot->hdr.info.magic == cpu_to_be16(XFS_DA3_NODE_MAGIC)) {

		struct xfs_da3_icnode_hdr nodehdr;

		struct xfs_da3_icnode_hdr icnodehdr;



		dp->d_ops->node_hdr_from_disk(&nodehdr, oldroot);

		dp->d_ops->node_hdr_from_disk(&icnodehdr, oldroot);

		btree = dp->d_ops->node_tree_p(oldroot);

		size = (int)((char *)&btree[nodehdr.count] - (char *)oldroot);

		level = nodehdr.level;

		size = (int)((char *)&btree[icnodehdr.count] - (char *)oldroot);

		level = icnodehdr.level;



		/*

		 * we are about to copy oldroot to bp, so set up the type

fs/xfs/xfs_error.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ xfs_error_report( 
{

	if (level <= xfs_error_level) {

		xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT,

		"Internal error %s at line %d of file %s.  Caller %pF",

		"Internal error %s at line %d of file %s.  Caller %pS",

			    tag, linenum, filename, ra);



		xfs_stack_trace();

fs/xfs/xfs_filestream.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ xfs_filestream_lookup_ag( 


	pip = xfs_filestream_get_parent(ip);

	if (!pip)

		goto out;

		return NULLAGNUMBER;



	mru = xfs_mru_cache_lookup(mp->m_filestream, pip->i_ino);

	if (mru) {

fs/xfs/xfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -2911,8 +2911,8 @@ xfs_rename( 
	struct xfs_inode	*wip = NULL;		/* whiteout inode */

	struct xfs_inode	*inodes[__XFS_SORT_INODES];

	int			num_inodes = __XFS_SORT_INODES;

	int			new_parent = (src_dp != target_dp);

	int			src_is_directory = S_ISDIR(src_ip->i_d.di_mode);

	bool			new_parent = (src_dp != target_dp);

	bool			src_is_directory = S_ISDIR(src_ip->i_d.di_mode);

	int			cancel_flags = 0;

	int			spaceres;

	int			error;