Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux.git] / fs / xfs / xfs_bmap_item.c

diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
index 26c87fd9ac9f540ea8f5794970c51eb88a7bd6c4..ee6f4229cebc476da27e1925d4ced3a9c411ead9 100644 (file)
--- a/fs/xfs/xfs_bmap_item.c
+++ b/fs/xfs/xfs_bmap_item.c
@@ -35,7 +35,7 @@ void
 xfs_bui_item_free(
        struct xfs_bui_log_item *buip)
 {
-       kmem_zone_free(xfs_bui_zone, buip);
+       kmem_cache_free(xfs_bui_zone, buip);
 }
 
 /*
@@ -201,7 +201,7 @@ xfs_bud_item_release(
        struct xfs_bud_log_item *budp = BUD_ITEM(lip);
 
        xfs_bui_release(budp->bud_buip);
-       kmem_zone_free(xfs_bud_zone, budp);
+       kmem_cache_free(xfs_bud_zone, budp);
 }
 
 static const struct xfs_item_ops xfs_bud_item_ops = {
@@ -456,7 +456,7 @@ xfs_bui_recover(
        if (buip->bui_format.bui_nextents != XFS_BUI_MAX_FAST_EXTENTS) {
                set_bit(XFS_BUI_RECOVERED, &buip->bui_flags);
                xfs_bui_release(buip);
-               return -EIO;
+               return -EFSCORRUPTED;
        }
 
        /*
@@ -490,7 +490,7 @@ xfs_bui_recover(
                 */
                set_bit(XFS_BUI_RECOVERED, &buip->bui_flags);
                xfs_bui_release(buip);
-               return -EIO;
+               return -EFSCORRUPTED;
        }
 
        error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate,