diff options
Diffstat (limited to 'fs/xfs/xfs_rtalloc.c')
-rw-r--r-- | fs/xfs/xfs_rtalloc.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index 16445518506d..891260fea11e 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c | |||
@@ -25,17 +25,10 @@ | |||
25 | #include "xfs_sb.h" | 25 | #include "xfs_sb.h" |
26 | #include "xfs_ag.h" | 26 | #include "xfs_ag.h" |
27 | #include "xfs_dir2.h" | 27 | #include "xfs_dir2.h" |
28 | #include "xfs_dmapi.h" | ||
29 | #include "xfs_mount.h" | 28 | #include "xfs_mount.h" |
30 | #include "xfs_bmap_btree.h" | 29 | #include "xfs_bmap_btree.h" |
31 | #include "xfs_alloc_btree.h" | ||
32 | #include "xfs_ialloc_btree.h" | ||
33 | #include "xfs_dir2_sf.h" | ||
34 | #include "xfs_attr_sf.h" | ||
35 | #include "xfs_dinode.h" | 30 | #include "xfs_dinode.h" |
36 | #include "xfs_inode.h" | 31 | #include "xfs_inode.h" |
37 | #include "xfs_btree.h" | ||
38 | #include "xfs_ialloc.h" | ||
39 | #include "xfs_alloc.h" | 32 | #include "xfs_alloc.h" |
40 | #include "xfs_bmap.h" | 33 | #include "xfs_bmap.h" |
41 | #include "xfs_rtalloc.h" | 34 | #include "xfs_rtalloc.h" |
@@ -129,7 +122,7 @@ xfs_growfs_rt_alloc( | |||
129 | cancelflags |= XFS_TRANS_ABORT; | 122 | cancelflags |= XFS_TRANS_ABORT; |
130 | error = xfs_bmapi(tp, ip, oblocks, nblocks - oblocks, | 123 | error = xfs_bmapi(tp, ip, oblocks, nblocks - oblocks, |
131 | XFS_BMAPI_WRITE | XFS_BMAPI_METADATA, &firstblock, | 124 | XFS_BMAPI_WRITE | XFS_BMAPI_METADATA, &firstblock, |
132 | resblks, &map, &nmap, &flist, NULL); | 125 | resblks, &map, &nmap, &flist); |
133 | if (!error && nmap < 1) | 126 | if (!error && nmap < 1) |
134 | error = XFS_ERROR(ENOSPC); | 127 | error = XFS_ERROR(ENOSPC); |
135 | if (error) | 128 | if (error) |
@@ -2277,12 +2270,12 @@ xfs_rtmount_inodes( | |||
2277 | sbp = &mp->m_sb; | 2270 | sbp = &mp->m_sb; |
2278 | if (sbp->sb_rbmino == NULLFSINO) | 2271 | if (sbp->sb_rbmino == NULLFSINO) |
2279 | return 0; | 2272 | return 0; |
2280 | error = xfs_iget(mp, NULL, sbp->sb_rbmino, 0, 0, &mp->m_rbmip, 0); | 2273 | error = xfs_iget(mp, NULL, sbp->sb_rbmino, 0, 0, &mp->m_rbmip); |
2281 | if (error) | 2274 | if (error) |
2282 | return error; | 2275 | return error; |
2283 | ASSERT(mp->m_rbmip != NULL); | 2276 | ASSERT(mp->m_rbmip != NULL); |
2284 | ASSERT(sbp->sb_rsumino != NULLFSINO); | 2277 | ASSERT(sbp->sb_rsumino != NULLFSINO); |
2285 | error = xfs_iget(mp, NULL, sbp->sb_rsumino, 0, 0, &mp->m_rsumip, 0); | 2278 | error = xfs_iget(mp, NULL, sbp->sb_rsumino, 0, 0, &mp->m_rsumip); |
2286 | if (error) { | 2279 | if (error) { |
2287 | IRELE(mp->m_rbmip); | 2280 | IRELE(mp->m_rbmip); |
2288 | return error; | 2281 | return error; |