1 files changed, 7 insertions, 9 deletions

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 65d7d994d499..f64b482a7953 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -226,7 +226,7 @@ xfs_inotobp(
         if (error)
                 return error;
 
-        error = xfs_imap_to_bp(mp, tp, &imap, &bp, XBF_LOCK, imap_flags);
+        error = xfs_imap_to_bp(mp, tp, &imap, &bp, 0, imap_flags);
         if (error)
                 return error;
 
@@ -782,8 +782,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,
-                               XBF_LOCK, iget_flags);
+        error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &bp, 0, iget_flags);
         if (error)
                 return error;
         dip = (xfs_dinode_t *)xfs_buf_offset(bp, ip->i_imap.im_boffset);
@@ -1342,7 +1341,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, XBF_LOCK);
+                error = xfs_itobp(mp, tp, ip, &dip, &ibp, 0);
                 if (error)
                         return error;
 
@@ -1423,7 +1422,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, XBF_LOCK);
+                error = xfs_itobp(mp, tp, ip, &dip, &ibp, 0);
                 if (error) {
                         xfs_warn(mp, "%s: xfs_itobp() returned error %d.",
                                 __func__, error);
@@ -1484,7 +1483,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, XBF_LOCK);
+                error = xfs_itobp(mp, tp, ip, &dip, &ibp, 0);
                 if (error) {
                         xfs_warn(mp, "%s: xfs_itobp(2) returned error %d.",
                                 __func__, error);
@@ -1566,8 +1565,7 @@ xfs_ifree_cluster(
                  * to mark all the active inodes on the buffer stale.
                  */
                 bp = xfs_trans_get_buf(tp, mp->m_ddev_targp, blkno,
-                                        mp->m_bsize * blks_per_cluster,
-                                        XBF_LOCK);
+                                        mp->m_bsize * blks_per_cluster, 0);
 
                 if (!bp)
                         return ENOMEM;
@@ -1737,7 +1735,7 @@ xfs_ifree(
 
         xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
 
-        error = xfs_itobp(ip->i_mount, tp, ip, &dip, &ibp, XBF_LOCK);
+        error = xfs_itobp(ip->i_mount, tp, ip, &dip, &ibp, 0);
         if (error)
                 return error;