diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-02-24 10:24:07 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-02-24 10:24:07 +1100 |
| commit | 3cabb836d801c3ad791c2dc6be07ec5819ab0a37 (patch) | |
| tree | dbc5bff557d23e978fd3c8920c7d99d8c09fa272 /fs/xfs/xfs_discard.c | |
| parent | 83d5f01858b56db69c8e4ca5389ef7c29bfdb5dd (diff) | |
| parent | 444a702231412e82fb1c09679adc159301e9242c (diff) | |
| download | op-kernel-dev-3cabb836d801c3ad791c2dc6be07ec5819ab0a37.zip op-kernel-dev-3cabb836d801c3ad791c2dc6be07ec5819ab0a37.tar.gz | |
Merge branch 'xfs-misc-fixes-for-4.1' into for-next
Diffstat (limited to 'fs/xfs/xfs_discard.c')
| -rw-r--r-- | fs/xfs/xfs_discard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c index 799e5a2..e85a951 100644 --- a/fs/xfs/xfs_discard.c +++ b/fs/xfs/xfs_discard.c @@ -84,7 +84,7 @@ xfs_trim_extents( error = xfs_alloc_get_rec(cur, &fbno, &flen, &i); if (error) goto out_del_cursor; - XFS_WANT_CORRUPTED_GOTO(i == 1, out_del_cursor); + XFS_WANT_CORRUPTED_GOTO(mp, i == 1, out_del_cursor); ASSERT(flen <= be32_to_cpu(XFS_BUF_TO_AGF(agbp)->agf_longest)); /* |
