|
@@ -972,10 +972,8 @@ xfs_dir_ialloc(
|
|
xfs_nlink_t nlink,
|
|
xfs_nlink_t nlink,
|
|
dev_t rdev,
|
|
dev_t rdev,
|
|
prid_t prid, /* project id */
|
|
prid_t prid, /* project id */
|
|
- xfs_inode_t **ipp, /* pointer to inode; it will be
|
|
|
|
|
|
+ xfs_inode_t **ipp) /* pointer to inode; it will be
|
|
locked. */
|
|
locked. */
|
|
- int *committed)
|
|
|
|
-
|
|
|
|
{
|
|
{
|
|
xfs_trans_t *tp;
|
|
xfs_trans_t *tp;
|
|
xfs_inode_t *ip;
|
|
xfs_inode_t *ip;
|
|
@@ -1050,8 +1048,6 @@ xfs_dir_ialloc(
|
|
}
|
|
}
|
|
|
|
|
|
code = xfs_trans_roll(&tp);
|
|
code = xfs_trans_roll(&tp);
|
|
- if (committed != NULL)
|
|
|
|
- *committed = 1;
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
* Re-attach the quota info that we detached from prev trx.
|
|
* Re-attach the quota info that we detached from prev trx.
|
|
@@ -1088,9 +1084,6 @@ xfs_dir_ialloc(
|
|
}
|
|
}
|
|
ASSERT(!ialloc_context && ip);
|
|
ASSERT(!ialloc_context && ip);
|
|
|
|
|
|
- } else {
|
|
|
|
- if (committed != NULL)
|
|
|
|
- *committed = 0;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
*ipp = ip;
|
|
*ipp = ip;
|
|
@@ -1217,8 +1210,7 @@ xfs_create(
|
|
* entry pointing to them, but a directory also the "." entry
|
|
* entry pointing to them, but a directory also the "." entry
|
|
* pointing to itself.
|
|
* pointing to itself.
|
|
*/
|
|
*/
|
|
- error = xfs_dir_ialloc(&tp, dp, mode, is_dir ? 2 : 1, rdev, prid, &ip,
|
|
|
|
- NULL);
|
|
|
|
|
|
+ error = xfs_dir_ialloc(&tp, dp, mode, is_dir ? 2 : 1, rdev, prid, &ip);
|
|
if (error)
|
|
if (error)
|
|
goto out_trans_cancel;
|
|
goto out_trans_cancel;
|
|
|
|
|
|
@@ -1351,7 +1343,7 @@ xfs_create_tmpfile(
|
|
if (error)
|
|
if (error)
|
|
goto out_trans_cancel;
|
|
goto out_trans_cancel;
|
|
|
|
|
|
- error = xfs_dir_ialloc(&tp, dp, mode, 1, 0, prid, &ip, NULL);
|
|
|
|
|
|
+ error = xfs_dir_ialloc(&tp, dp, mode, 1, 0, prid, &ip);
|
|
if (error)
|
|
if (error)
|
|
goto out_trans_cancel;
|
|
goto out_trans_cancel;
|
|
|
|
|