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

Commit a6cf33bc authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-bug-fixes-for-3.15-3' into for-next

parents fe986f9d c88547a8

fs/xfs/xfs_aops.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -659,10 +659,10 @@ xfs_check_page_type( 
			if (type == XFS_IO_UNWRITTEN)

			if (type == XFS_IO_UNWRITTEN)

				return true;

				return true;

		} else if (buffer_delay(bh)) {

		} else if (buffer_delay(bh)) {

			if (type == XFS_IO_DELALLOC);

			if (type == XFS_IO_DELALLOC)

				return true;

				return true;

		} else if (buffer_dirty(bh) && buffer_mapped(bh)) {

		} else if (buffer_dirty(bh) && buffer_mapped(bh)) {

			if (type == XFS_IO_OVERWRITE);

			if (type == XFS_IO_OVERWRITE)

				return true;

				return true;

		}

		}

fs/xfs/xfs_da_btree.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1296,7 +1296,7 @@ xfs_da3_fixhashpath( 
		node = blk->bp->b_addr;

		node = blk->bp->b_addr;

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

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

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

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

		if (be32_to_cpu(btree->hashval) == lasthash)

		if (be32_to_cpu(btree[blk->index].hashval) == lasthash)

			break;

			break;

		blk->hashval = lasthash;

		blk->hashval = lasthash;

		btree[blk->index].hashval = cpu_to_be32(lasthash);

		btree[blk->index].hashval = cpu_to_be32(lasthash);