ip->i_afp->if_nextents == 0);
}
-/*
- * Attempts to set an attr in shortform, or converts short form to leaf form if
- * there is not enough room. If the attr is set, the transaction is committed
- * and set to NULL.
- */
STATIC int
-xfs_attr_set_shortform(
- struct xfs_da_args *args,
- struct xfs_buf **leaf_bp)
+xfs_attr_set_fmt(
+ struct xfs_da_args *args)
{
+ struct xfs_buf *leaf_bp = NULL;
struct xfs_inode *dp = args->dp;
int error, error2 = 0;
args->trans = NULL;
return error ? error : error2;
}
+
/*
* It won't fit in the shortform, transform to a leaf block. GROT:
* another possible req'mt for a double-split btree op.
*/
- error = xfs_attr_shortform_to_leaf(args, leaf_bp);
+ error = xfs_attr_shortform_to_leaf(args, &leaf_bp);
if (error)
return error;
/*
* Prevent the leaf buffer from being unlocked so that a concurrent AIL
* push cannot grab the half-baked leaf buffer and run into problems
- * with the write verifier. Once we're done rolling the transaction we
- * can release the hold and add the attr to the leaf.
+ * with the write verifier.
*/
- xfs_trans_bhold(args->trans, *leaf_bp);
+ xfs_trans_bhold(args->trans, leaf_bp);
error = xfs_defer_finish(&args->trans);
- xfs_trans_bhold_release(args->trans, *leaf_bp);
+ xfs_trans_bhold_release(args->trans, leaf_bp);
if (error) {
- xfs_trans_brelse(args->trans, *leaf_bp);
+ xfs_trans_brelse(args->trans, leaf_bp);
return error;
}
- return 0;
+ return -EAGAIN;
}
/*
struct xfs_da_args *args)
{
struct xfs_inode *dp = args->dp;
- struct xfs_buf *leaf_bp = NULL;
- int error = 0;
+ int error;
/*
* If the attribute list is already in leaf format, jump straight to
* again.
*/
if (xfs_attr_is_shortform(dp)) {
-
- /*
- * If the attr was successfully set in shortform, the
- * transaction is committed and set to NULL. Otherwise, is it
- * converted from shortform to leaf, and the transaction is
- * retained.
- */
- error = xfs_attr_set_shortform(args, &leaf_bp);
- if (error || !args->trans)
+ error = xfs_attr_set_fmt(args);
+ if (error != -EAGAIN)
return error;
}
return error;
}
- error = xfs_attr_node_addname(args);
- return error;
+ return xfs_attr_node_addname(args);
}
/*