diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /fs/xfs/xfs_alloc.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/xfs/xfs_alloc.c')
| -rw-r--r-- | fs/xfs/xfs_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c index bdd9cb54d63b..ce84ffd0264c 100644 --- a/fs/xfs/xfs_alloc.c +++ b/fs/xfs/xfs_alloc.c | |||
| @@ -452,7 +452,7 @@ xfs_alloc_read_agfl( | |||
| 452 | if (error) | 452 | if (error) |
| 453 | return error; | 453 | return error; |
| 454 | ASSERT(!xfs_buf_geterror(bp)); | 454 | ASSERT(!xfs_buf_geterror(bp)); |
| 455 | XFS_BUF_SET_VTYPE_REF(bp, B_FS_AGFL, XFS_AGFL_REF); | 455 | xfs_buf_set_ref(bp, XFS_AGFL_REF); |
| 456 | *bpp = bp; | 456 | *bpp = bp; |
| 457 | return 0; | 457 | return 0; |
| 458 | } | 458 | } |
| @@ -2139,7 +2139,7 @@ xfs_read_agf( | |||
| 2139 | xfs_trans_brelse(tp, *bpp); | 2139 | xfs_trans_brelse(tp, *bpp); |
| 2140 | return XFS_ERROR(EFSCORRUPTED); | 2140 | return XFS_ERROR(EFSCORRUPTED); |
| 2141 | } | 2141 | } |
| 2142 | XFS_BUF_SET_VTYPE_REF(*bpp, B_FS_AGF, XFS_AGF_REF); | 2142 | xfs_buf_set_ref(*bpp, XFS_AGF_REF); |
| 2143 | return 0; | 2143 | return 0; |
| 2144 | } | 2144 | } |
| 2145 | 2145 | ||