1 files changed, 4 insertions, 3 deletions

diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c
index 8fad9602542b..d4906e7c9787 100644
--- a/fs/xfs/xfs_attr_leaf.c
+++ b/fs/xfs/xfs_attr_leaf.c
@@ -2926,9 +2926,8 @@ xfs_attr_leaf_freextent(xfs_trans_t **trans, xfs_inode_t *dp,
                  * Try to remember where we decided to put the value.
                  */
                 nmap = 1;
-                error = xfs_bmapi(*trans, dp, (xfs_fileoff_t)tblkno, tblkcnt,
-                                        XFS_BMAPI_ATTRFORK | XFS_BMAPI_METADATA,
-                                        NULL, 0, &map, &nmap, NULL);
+                error = xfs_bmapi_read(dp, (xfs_fileoff_t)tblkno, tblkcnt,
+                                       &map, &nmap, XFS_BMAPI_ATTRFORK);
                 if (error) {
                         return(error);
                 }
@@ -2948,6 +2947,8 @@ xfs_attr_leaf_freextent(xfs_trans_t **trans, xfs_inode_t *dp,
                         bp = xfs_trans_get_buf(*trans,
                                         dp->i_mount->m_ddev_targp,
                                         dblkno, dblkcnt, XBF_LOCK);
+                        if (!bp)
+                                return ENOMEM;
                         xfs_trans_binval(*trans, bp);
                         /*
                          * Roll to next transaction.