Merge tag 'libnvdimm-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...

[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 9fa4a7ee8cfc2ebb86fe5fc1216dd92b7e19f672..83d24e983d4c2d004a46b99a3d217041709f731c 100644 (file)
--- a/fs/xfs/xfs_bmap_item.c
+++ b/fs/xfs/xfs_bmap_item.c
@@ -141,7 +141,7 @@ xfs_bui_init(
 {
        struct xfs_bui_log_item         *buip;
 
-       buip = kmem_zone_zalloc(xfs_bui_zone, KM_SLEEP);
+       buip = kmem_zone_zalloc(xfs_bui_zone, 0);
 
        xfs_log_item_init(mp, &buip->bui_item, XFS_LI_BUI, &xfs_bui_item_ops);
        buip->bui_format.bui_nextents = XFS_BUI_MAX_FAST_EXTENTS;
@@ -218,7 +218,7 @@ xfs_trans_get_bud(
 {
        struct xfs_bud_log_item         *budp;
 
-       budp = kmem_zone_zalloc(xfs_bud_zone, KM_SLEEP);
+       budp = kmem_zone_zalloc(xfs_bud_zone, 0);
        xfs_log_item_init(tp->t_mountp, &budp->bud_item, XFS_LI_BUD,
                          &xfs_bud_item_ops);
        budp->bud_buip = buip;
@@ -542,9 +542,7 @@ xfs_bui_recover(
                irec.br_blockcount = count;
                irec.br_startoff = bmap->me_startoff;
                irec.br_state = state;
-               error = xfs_bmap_unmap_extent(tp, ip, &irec);
-               if (error)
-                       goto err_inode;
+               xfs_bmap_unmap_extent(tp, ip, &irec);
        }
 
        set_bit(XFS_BUI_RECOVERED, &buip->bui_flags);