diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 12:50:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 12:50:15 -0800 |
| commit | 993ecff81aa6d50d694704de2647a5529ff2f166 (patch) | |
| tree | 047a313e86f63e22f1eff63945bea2e8e8147222 | |
| parent | 12e55508921865aefdd80fd17afe70c191afbd1b (diff) | |
| parent | b1c770c273a4787069306fc82aab245e9ac72e9d (diff) | |
| download | linux-993ecff81aa6d50d694704de2647a5529ff2f166.tar.bz2 | |
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
| -rw-r--r-- | fs/xfs/xfs_discard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c index 8a24f0c6c860..286a051f12cf 100644 --- a/fs/xfs/xfs_discard.c +++ b/fs/xfs/xfs_discard.c @@ -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. |