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

[platform/upstream/kernel-adaptation-pc.git] / fs / xfs / linux-2.6 / xfs_buf.c

diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index d5b2d2b..b9c8589 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -1127,19 +1127,15 @@ _xfs_buf_ioend(
        }
 }
 
-STATIC int
+STATIC void
 xfs_buf_bio_end_io(
        struct bio              *bio,
-       unsigned int            bytes_done,
        int                     error)
 {
        xfs_buf_t               *bp = (xfs_buf_t *)bio->bi_private;
        unsigned int            blocksize = bp->b_target->bt_bsize;
        struct bio_vec          *bvec = bio->bi_io_vec + bio->bi_vcnt - 1;
 
-       if (bio->bi_size)
-               return 1;
-
        if (!test_bit(BIO_UPTODATE, &bio->bi_flags))
                bp->b_error = EIO;
 
@@ -1167,7 +1163,6 @@ xfs_buf_bio_end_io(
 
        _xfs_buf_ioend(bp, 1);
        bio_put(bio);
-       return 0;
 }
 
 STATIC void