|
@@ -151,7 +151,7 @@ xfs_imap_to_bp(
|
|
|
"an error %d on %s. Returning error.",
|
|
|
error, mp->m_fsname);
|
|
|
} else {
|
|
|
- ASSERT(buf_flags & XFS_BUF_TRYLOCK);
|
|
|
+ ASSERT(buf_flags & XBF_TRYLOCK);
|
|
|
}
|
|
|
return error;
|
|
|
}
|
|
@@ -239,7 +239,7 @@ xfs_inotobp(
|
|
|
if (error)
|
|
|
return error;
|
|
|
|
|
|
- error = xfs_imap_to_bp(mp, tp, &imap, &bp, XFS_BUF_LOCK, imap_flags);
|
|
|
+ error = xfs_imap_to_bp(mp, tp, &imap, &bp, XBF_LOCK, imap_flags);
|
|
|
if (error)
|
|
|
return error;
|
|
|
|
|
@@ -285,7 +285,7 @@ xfs_itobp(
|
|
|
return error;
|
|
|
|
|
|
if (!bp) {
|
|
|
- ASSERT(buf_flags & XFS_BUF_TRYLOCK);
|
|
|
+ ASSERT(buf_flags & XBF_TRYLOCK);
|
|
|
ASSERT(tp == NULL);
|
|
|
*bpp = NULL;
|
|
|
return EAGAIN;
|
|
@@ -807,7 +807,7 @@ xfs_iread(
|
|
|
* Get pointers to the on-disk inode and the buffer containing it.
|
|
|
*/
|
|
|
error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &bp,
|
|
|
- XFS_BUF_LOCK, iget_flags);
|
|
|
+ XBF_LOCK, iget_flags);
|
|
|
if (error)
|
|
|
return error;
|
|
|
dip = (xfs_dinode_t *)xfs_buf_offset(bp, ip->i_imap.im_boffset);
|
|
@@ -1751,7 +1751,7 @@ xfs_iunlink(
|
|
|
* Here we put the head pointer into our next pointer,
|
|
|
* and then we fall through to point the head at us.
|
|
|
*/
|
|
|
- error = xfs_itobp(mp, tp, ip, &dip, &ibp, XFS_BUF_LOCK);
|
|
|
+ error = xfs_itobp(mp, tp, ip, &dip, &ibp, XBF_LOCK);
|
|
|
if (error)
|
|
|
return error;
|
|
|
|
|
@@ -1833,7 +1833,7 @@ xfs_iunlink_remove(
|
|
|
* of dealing with the buffer when there is no need to
|
|
|
* change it.
|
|
|
*/
|
|
|
- error = xfs_itobp(mp, tp, ip, &dip, &ibp, XFS_BUF_LOCK);
|
|
|
+ error = xfs_itobp(mp, tp, ip, &dip, &ibp, XBF_LOCK);
|
|
|
if (error) {
|
|
|
cmn_err(CE_WARN,
|
|
|
"xfs_iunlink_remove: xfs_itobp() returned an error %d on %s. Returning error.",
|
|
@@ -1895,7 +1895,7 @@ xfs_iunlink_remove(
|
|
|
* Now last_ibp points to the buffer previous to us on
|
|
|
* the unlinked list. Pull us from the list.
|
|
|
*/
|
|
|
- error = xfs_itobp(mp, tp, ip, &dip, &ibp, XFS_BUF_LOCK);
|
|
|
+ error = xfs_itobp(mp, tp, ip, &dip, &ibp, XBF_LOCK);
|
|
|
if (error) {
|
|
|
cmn_err(CE_WARN,
|
|
|
"xfs_iunlink_remove: xfs_itobp() returned an error %d on %s. Returning error.",
|
|
@@ -2040,7 +2040,7 @@ xfs_ifree_cluster(
|
|
|
|
|
|
bp = xfs_trans_get_buf(tp, mp->m_ddev_targp, blkno,
|
|
|
mp->m_bsize * blks_per_cluster,
|
|
|
- XFS_BUF_LOCK);
|
|
|
+ XBF_LOCK);
|
|
|
|
|
|
pre_flushed = 0;
|
|
|
lip = XFS_BUF_FSPRIVATE(bp, xfs_log_item_t *);
|
|
@@ -2151,7 +2151,7 @@ xfs_ifree(
|
|
|
|
|
|
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
|
|
|
|
|
|
- error = xfs_itobp(ip->i_mount, tp, ip, &dip, &ibp, XFS_BUF_LOCK);
|
|
|
+ error = xfs_itobp(ip->i_mount, tp, ip, &dip, &ibp, XBF_LOCK);
|
|
|
if (error)
|
|
|
return error;
|
|
|
|
|
@@ -2952,7 +2952,7 @@ xfs_iflush(
|
|
|
* Get the buffer containing the on-disk inode.
|
|
|
*/
|
|
|
error = xfs_itobp(mp, NULL, ip, &dip, &bp,
|
|
|
- noblock ? XFS_BUF_TRYLOCK : XFS_BUF_LOCK);
|
|
|
+ noblock ? XBF_TRYLOCK : XBF_LOCK);
|
|
|
if (error || !bp) {
|
|
|
xfs_ifunlock(ip);
|
|
|
return error;
|