xfs: kill XBF_LOCK

Buffers are always returned locked from the lookup routines. Hence
we don't need to tell the lookup routines to return locked buffers,
on to try and lock them. Remove XBF_LOCK from all the callers and
from internal buffer cache usage.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 019ba5c52a49..874d39883dab 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -193,7 +193,7 @@ xfs_growfs_data_private(
                  */
                 bp = xfs_buf_get(mp->m_ddev_targp,
                                  XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR(mp)),
-                                 XFS_FSS_TO_BB(mp, 1), XBF_LOCK | XBF_MAPPED);
+                                 XFS_FSS_TO_BB(mp, 1), XBF_MAPPED);
                 if (!bp) {
                         error = ENOMEM;
                         goto error0;
@@ -230,7 +230,7 @@ xfs_growfs_data_private(
                  */
                 bp = xfs_buf_get(mp->m_ddev_targp,
                                  XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),
-                                 XFS_FSS_TO_BB(mp, 1), XBF_LOCK | XBF_MAPPED);
+                                 XFS_FSS_TO_BB(mp, 1), XBF_MAPPED);
                 if (!bp) {
                         error = ENOMEM;
                         goto error0;
@@ -259,8 +259,7 @@ xfs_growfs_data_private(
                  */
                 bp = xfs_buf_get(mp->m_ddev_targp,
                                  XFS_AGB_TO_DADDR(mp, agno, XFS_BNO_BLOCK(mp)),
-                                 BTOBB(mp->m_sb.sb_blocksize),
-                                 XBF_LOCK | XBF_MAPPED);
+                                 BTOBB(mp->m_sb.sb_blocksize), XBF_MAPPED);
                 if (!bp) {
                         error = ENOMEM;
                         goto error0;
@@ -286,8 +285,7 @@ xfs_growfs_data_private(
                  */
                 bp = xfs_buf_get(mp->m_ddev_targp,
                                  XFS_AGB_TO_DADDR(mp, agno, XFS_CNT_BLOCK(mp)),
-                                 BTOBB(mp->m_sb.sb_blocksize),
-                                 XBF_LOCK | XBF_MAPPED);
+                                 BTOBB(mp->m_sb.sb_blocksize), XBF_MAPPED);
                 if (!bp) {
                         error = ENOMEM;
                         goto error0;
@@ -314,8 +312,7 @@ xfs_growfs_data_private(
                  */
                 bp = xfs_buf_get(mp->m_ddev_targp,
                                  XFS_AGB_TO_DADDR(mp, agno, XFS_IBT_BLOCK(mp)),
-                                 BTOBB(mp->m_sb.sb_blocksize),
-                                 XBF_LOCK | XBF_MAPPED);
+                                 BTOBB(mp->m_sb.sb_blocksize), XBF_MAPPED);
                 if (!bp) {
                         error = ENOMEM;
                         goto error0;