Merge branch 'origin'

1 files changed, 1 insertions, 7 deletions

diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index ea79072f5210..d72cf2bb054a 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -440,12 +440,7 @@ _xfs_buf_find(
                 ASSERT(btp == bp->b_target);
                 if (bp->b_file_offset == range_base &&
                     bp->b_buffer_length == range_length) {
-                        /*
-                         * If we look at something, bring it to the
-                         * front of the list for next time.
-                         */
                         atomic_inc(&bp->b_hold);
-                        list_move(&bp->b_hash_list, &hash->bh_list);
                         goto found;
                 }
         }
@@ -1443,8 +1438,7 @@ xfs_alloc_bufhash(
 {
         unsigned int            i;
 
-        btp->bt_hashshift = external ? 3 : 8;   /* 8 or 256 buckets */
-        btp->bt_hashmask = (1 << btp->bt_hashshift) - 1;
+        btp->bt_hashshift = external ? 3 : 12;  /* 8 or 4096 buckets */
         btp->bt_hash = kmem_zalloc_large((1 << btp->bt_hashshift) *
                                          sizeof(xfs_bufhash_t));
         for (i = 0; i < (1 << btp->bt_hashshift); i++) {