Merge branch 'master' of git+ssh://git.melbourne.sgi.com/git/xfs

diff --combined fs/xfs/linux-2.6/xfs_buf.c
index aae8d0768eca2f17cbe5961fd7fb1c07aa9a659f,b9c304a629ee130cebd9ef99259fc173682db1ec..cb329edc925b915ae5e590edeb4840810f811326
--- 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
@@@ -1085,7 -1085,7 +1085,7 @@@ xfs_bawrite
        bp->b_flags &= ~(XBF_READ | XBF_DELWRI | XBF_READ_AHEAD);
        bp->b_flags |= (XBF_WRITE | XBF_ASYNC | _XBF_RUN_QUEUES);
  
-       bp->b_fspriv3 = mp;
+       bp->b_mount = mp;
        bp->b_strat = xfs_bdstrat_cb;
        return xfs_bdstrat_cb(bp);
  }
@@@ -1098,7 -1098,7 +1098,7 @@@ xfs_bdwrite
        XB_TRACE(bp, "bdwrite", 0);
  
        bp->b_strat = xfs_bdstrat_cb;
-       bp->b_fspriv3 = mp;
+       bp->b_mount = mp;
  
        bp->b_flags &= ~XBF_READ;
        bp->b_flags |= (XBF_DELWRI | XBF_ASYNC);
@@@ -1126,7 -1126,8 +1126,7 @@@ xfs_buf_bio_end_io
        unsigned int            blocksize = bp->b_target->bt_bsize;
        struct bio_vec          *bvec = bio->bi_io_vec + bio->bi_vcnt - 1;
  
 -      if (!test_bit(BIO_UPTODATE, &bio->bi_flags))
 -              bp->b_error = EIO;
 +      xfs_buf_ioerror(bp, -error);
  
        do {
                struct page     *page = bvec->bv_page;