diff options
Diffstat (limited to 'fs/xfs/xfs_da_btree.c')
-rw-r--r-- | fs/xfs/xfs_da_btree.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c index 021a8f7e563f..294780427abb 100644 --- a/fs/xfs/xfs_da_btree.c +++ b/fs/xfs/xfs_da_btree.c | |||
@@ -1598,7 +1598,7 @@ xfs_da_grow_inode(xfs_da_args_t *args, xfs_dablk_t *new_blkno) | |||
1598 | args->firstblock, args->total, | 1598 | args->firstblock, args->total, |
1599 | &mapp[mapi], &nmap, args->flist, | 1599 | &mapp[mapi], &nmap, args->flist, |
1600 | NULL))) { | 1600 | NULL))) { |
1601 | kmem_free(mapp, sizeof(*mapp) * count); | 1601 | kmem_free(mapp); |
1602 | return error; | 1602 | return error; |
1603 | } | 1603 | } |
1604 | if (nmap < 1) | 1604 | if (nmap < 1) |
@@ -1620,11 +1620,11 @@ xfs_da_grow_inode(xfs_da_args_t *args, xfs_dablk_t *new_blkno) | |||
1620 | mapp[mapi - 1].br_startoff + mapp[mapi - 1].br_blockcount != | 1620 | mapp[mapi - 1].br_startoff + mapp[mapi - 1].br_blockcount != |
1621 | bno + count) { | 1621 | bno + count) { |
1622 | if (mapp != &map) | 1622 | if (mapp != &map) |
1623 | kmem_free(mapp, sizeof(*mapp) * count); | 1623 | kmem_free(mapp); |
1624 | return XFS_ERROR(ENOSPC); | 1624 | return XFS_ERROR(ENOSPC); |
1625 | } | 1625 | } |
1626 | if (mapp != &map) | 1626 | if (mapp != &map) |
1627 | kmem_free(mapp, sizeof(*mapp) * count); | 1627 | kmem_free(mapp); |
1628 | *new_blkno = (xfs_dablk_t)bno; | 1628 | *new_blkno = (xfs_dablk_t)bno; |
1629 | return 0; | 1629 | return 0; |
1630 | } | 1630 | } |
@@ -2090,10 +2090,10 @@ xfs_da_do_buf( | |||
2090 | } | 2090 | } |
2091 | } | 2091 | } |
2092 | if (bplist) { | 2092 | if (bplist) { |
2093 | kmem_free(bplist, sizeof(*bplist) * nmap); | 2093 | kmem_free(bplist); |
2094 | } | 2094 | } |
2095 | if (mapp != &map) { | 2095 | if (mapp != &map) { |
2096 | kmem_free(mapp, sizeof(*mapp) * nfsb); | 2096 | kmem_free(mapp); |
2097 | } | 2097 | } |
2098 | if (bpp) | 2098 | if (bpp) |
2099 | *bpp = rbp; | 2099 | *bpp = rbp; |
@@ -2102,11 +2102,11 @@ exit1: | |||
2102 | if (bplist) { | 2102 | if (bplist) { |
2103 | for (i = 0; i < nbplist; i++) | 2103 | for (i = 0; i < nbplist; i++) |
2104 | xfs_trans_brelse(trans, bplist[i]); | 2104 | xfs_trans_brelse(trans, bplist[i]); |
2105 | kmem_free(bplist, sizeof(*bplist) * nmap); | 2105 | kmem_free(bplist); |
2106 | } | 2106 | } |
2107 | exit0: | 2107 | exit0: |
2108 | if (mapp != &map) | 2108 | if (mapp != &map) |
2109 | kmem_free(mapp, sizeof(*mapp) * nfsb); | 2109 | kmem_free(mapp); |
2110 | if (bpp) | 2110 | if (bpp) |
2111 | *bpp = NULL; | 2111 | *bpp = NULL; |
2112 | return error; | 2112 | return error; |
@@ -2315,7 +2315,7 @@ xfs_da_buf_done(xfs_dabuf_t *dabuf) | |||
2315 | if (dabuf->dirty) | 2315 | if (dabuf->dirty) |
2316 | xfs_da_buf_clean(dabuf); | 2316 | xfs_da_buf_clean(dabuf); |
2317 | if (dabuf->nbuf > 1) | 2317 | if (dabuf->nbuf > 1) |
2318 | kmem_free(dabuf->data, BBTOB(dabuf->bbcount)); | 2318 | kmem_free(dabuf->data); |
2319 | #ifdef XFS_DABUF_DEBUG | 2319 | #ifdef XFS_DABUF_DEBUG |
2320 | { | 2320 | { |
2321 | spin_lock(&xfs_dabuf_global_lock); | 2321 | spin_lock(&xfs_dabuf_global_lock); |
@@ -2332,7 +2332,7 @@ xfs_da_buf_done(xfs_dabuf_t *dabuf) | |||
2332 | if (dabuf->nbuf == 1) | 2332 | if (dabuf->nbuf == 1) |
2333 | kmem_zone_free(xfs_dabuf_zone, dabuf); | 2333 | kmem_zone_free(xfs_dabuf_zone, dabuf); |
2334 | else | 2334 | else |
2335 | kmem_free(dabuf, XFS_DA_BUF_SIZE(dabuf->nbuf)); | 2335 | kmem_free(dabuf); |
2336 | } | 2336 | } |
2337 | 2337 | ||
2338 | /* | 2338 | /* |
@@ -2403,7 +2403,7 @@ xfs_da_brelse(xfs_trans_t *tp, xfs_dabuf_t *dabuf) | |||
2403 | for (i = 0; i < nbuf; i++) | 2403 | for (i = 0; i < nbuf; i++) |
2404 | xfs_trans_brelse(tp, bplist[i]); | 2404 | xfs_trans_brelse(tp, bplist[i]); |
2405 | if (bplist != &bp) | 2405 | if (bplist != &bp) |
2406 | kmem_free(bplist, nbuf * sizeof(*bplist)); | 2406 | kmem_free(bplist); |
2407 | } | 2407 | } |
2408 | 2408 | ||
2409 | /* | 2409 | /* |
@@ -2429,7 +2429,7 @@ xfs_da_binval(xfs_trans_t *tp, xfs_dabuf_t *dabuf) | |||
2429 | for (i = 0; i < nbuf; i++) | 2429 | for (i = 0; i < nbuf; i++) |
2430 | xfs_trans_binval(tp, bplist[i]); | 2430 | xfs_trans_binval(tp, bplist[i]); |
2431 | if (bplist != &bp) | 2431 | if (bplist != &bp) |
2432 | kmem_free(bplist, nbuf * sizeof(*bplist)); | 2432 | kmem_free(bplist); |
2433 | } | 2433 | } |
2434 | 2434 | ||
2435 | /* | 2435 | /* |