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

Commit 993ecff8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix endian conversion issue in discard code
parents 12e55508 b1c770c2

fs/xfs/xfs_discard.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ xfs_trim_extents( 
	 * Look up the longest btree in the AGF and start with it.

	 */

	error = xfs_alloc_lookup_le(cur, 0,

				    XFS_BUF_TO_AGF(agbp)->agf_longest, &i);

			    be32_to_cpu(XFS_BUF_TO_AGF(agbp)->agf_longest), &i);

	if (error)

		goto out_del_cursor;
@@ -84,7 +84,7 @@ xfs_trim_extents( 
		if (error)

			goto out_del_cursor;

		XFS_WANT_CORRUPTED_GOTO(i == 1, out_del_cursor);

		ASSERT(flen <= XFS_BUF_TO_AGF(agbp)->agf_longest);

		ASSERT(flen <= be32_to_cpu(XFS_BUF_TO_AGF(agbp)->agf_longest));



		/*

		 * Too small?  Give up.