|
@@ -791,9 +791,8 @@ xfs_attr_shortform_to_leaf(
|
|
ASSERT(blkno == 0);
|
|
ASSERT(blkno == 0);
|
|
error = xfs_attr3_leaf_create(args, blkno, &bp);
|
|
error = xfs_attr3_leaf_create(args, blkno, &bp);
|
|
if (error) {
|
|
if (error) {
|
|
- error = xfs_da_shrink_inode(args, 0, bp);
|
|
|
|
- bp = NULL;
|
|
|
|
- if (error)
|
|
|
|
|
|
+ /* xfs_attr3_leaf_create may not have instantiated a block */
|
|
|
|
+ if (bp && (xfs_da_shrink_inode(args, 0, bp) != 0))
|
|
goto out;
|
|
goto out;
|
|
xfs_idata_realloc(dp, size, XFS_ATTR_FORK); /* try to put */
|
|
xfs_idata_realloc(dp, size, XFS_ATTR_FORK); /* try to put */
|
|
memcpy(ifp->if_u1.if_data, tmpbuffer, size); /* it back */
|
|
memcpy(ifp->if_u1.if_data, tmpbuffer, size); /* it back */
|