diff options
Diffstat (limited to 'fs/xfs/xfs_rtalloc.c')
-rw-r--r-- | fs/xfs/xfs_rtalloc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index 87323f1ded64..ca4f31534a0a 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c | |||
@@ -183,6 +183,7 @@ error_cancel: | |||
183 | oblocks = map.br_startoff + map.br_blockcount; | 183 | oblocks = map.br_startoff + map.br_blockcount; |
184 | } | 184 | } |
185 | return 0; | 185 | return 0; |
186 | |||
186 | error: | 187 | error: |
187 | return error; | 188 | return error; |
188 | } | 189 | } |
@@ -2139,11 +2140,9 @@ xfs_rtfree_extent( | |||
2139 | xfs_buf_t *sumbp; /* summary file block buffer */ | 2140 | xfs_buf_t *sumbp; /* summary file block buffer */ |
2140 | 2141 | ||
2141 | mp = tp->t_mountp; | 2142 | mp = tp->t_mountp; |
2142 | /* | 2143 | |
2143 | * Synchronize by locking the bitmap inode. | 2144 | ASSERT(mp->m_rbmip->i_itemp != NULL); |
2144 | */ | 2145 | ASSERT(xfs_isilocked(mp->m_rbmip, XFS_ILOCK_EXCL)); |
2145 | xfs_ilock(mp->m_rbmip, XFS_ILOCK_EXCL); | ||
2146 | xfs_trans_ijoin(tp, mp->m_rbmip, XFS_ILOCK_EXCL); | ||
2147 | 2146 | ||
2148 | #if defined(__KERNEL__) && defined(DEBUG) | 2147 | #if defined(__KERNEL__) && defined(DEBUG) |
2149 | /* | 2148 | /* |