Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix spin_is_locked assert on uni-processor builds
  xfs: check for dinode realtime flag corruption
  use XFS_CORRUPTION_ERROR in xfs_btree_check_sblock
  xfs: switch to NOFS allocation under i_lock in xfs_attr_rmtval_get
  xfs: switch to NOFS allocation under i_lock in xfs_readlink_bmap
  xfs: switch to NOFS allocation under i_lock in xfs_attr_rmtval_set
  xfs: switch to NOFS allocation under i_lock in xfs_buf_associate_memory
  xfs: switch to NOFS allocation under i_lock in xfs_dir_cilookup_result
  xfs: switch to NOFS allocation under i_lock in xfs_da_buf_make
  xfs: switch to NOFS allocation under i_lock in xfs_da_state_alloc
  xfs: switch to NOFS allocation under i_lock in xfs_getbmap
  xfs: avoid memory allocation under m_peraglock in growfs code

diff --combined fs/xfs/linux-2.6/xfs_buf.c
index 0c93c7ef3d187a27dbe6b8196de4aaa08be66447,178c20c13e839c9d854056ee53b00ed722834a92..965df1227d644df44b4d2b79810f1ab42747f957
--- 1/fs/xfs/linux-2.6/xfs_buf.c
--- 2/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@@ -412,7 -412,7 +412,7 @@@ _xfs_buf_lookup_pages
  
                        XFS_STATS_INC(xb_page_retries);
                        xfsbufd_wakeup(0, gfp_mask);
 -                      congestion_wait(WRITE, HZ/50);
 +                      congestion_wait(BLK_RW_ASYNC, HZ/50);
                        goto retry;
                }
  
@@@ -770,7 -770,7 +770,7 @@@ xfs_buf_associate_memory
        bp->b_pages = NULL;
        bp->b_addr = mem;
  
-       rval = _xfs_buf_get_pages(bp, page_count, 0);
+       rval = _xfs_buf_get_pages(bp, page_count, XBF_DONT_BLOCK);
        if (rval)
                return rval;