diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 15:50:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 15:50:15 -0500 |
| commit | 993ecff81aa6d50d694704de2647a5529ff2f166 (patch) | |
| tree | 047a313e86f63e22f1eff63945bea2e8e8147222 /fs/xfs | |
| parent | 12e55508921865aefdd80fd17afe70c191afbd1b (diff) | |
| parent | b1c770c273a4787069306fc82aab245e9ac72e9d (diff) | |
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
Diffstat (limited to 'fs/xfs')
| -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 8a24f0c6c86..286a051f12c 100644 --- a/fs/xfs/xfs_discard.c +++ b/fs/xfs/xfs_discard.c | |||
| @@ -68,7 +68,7 @@ xfs_trim_extents( | |||
| 68 | * Look up the longest btree in the AGF and start with it. | 68 | * Look up the longest btree in the AGF and start with it. |
| 69 | */ | 69 | */ |
| 70 | error = xfs_alloc_lookup_le(cur, 0, | 70 | error = xfs_alloc_lookup_le(cur, 0, |
| 71 | XFS_BUF_TO_AGF(agbp)->agf_longest, &i); | 71 | be32_to_cpu(XFS_BUF_TO_AGF(agbp)->agf_longest), &i); |
| 72 | if (error) | 72 | if (error) |
| 73 | goto out_del_cursor; | 73 | goto out_del_cursor; |
| 74 | 74 | ||
| @@ -84,7 +84,7 @@ xfs_trim_extents( | |||
| 84 | if (error) | 84 | if (error) |
| 85 | goto out_del_cursor; | 85 | goto out_del_cursor; |
| 86 | XFS_WANT_CORRUPTED_GOTO(i == 1, out_del_cursor); | 86 | XFS_WANT_CORRUPTED_GOTO(i == 1, out_del_cursor); |
| 87 | ASSERT(flen <= XFS_BUF_TO_AGF(agbp)->agf_longest); | 87 | ASSERT(flen <= be32_to_cpu(XFS_BUF_TO_AGF(agbp)->agf_longest)); |
| 88 | 88 | ||
| 89 | /* | 89 | /* |
| 90 | * Too small? Give up. | 90 | * Too small? Give up. |