diff options
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 4 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_buf.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 5f152f60d74d..3f13519436af 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
@@ -326,14 +326,10 @@ xfs_iomap_valid( | |||
326 | STATIC int | 326 | STATIC int |
327 | xfs_end_bio( | 327 | xfs_end_bio( |
328 | struct bio *bio, | 328 | struct bio *bio, |
329 | unsigned int bytes_done, | ||
330 | int error) | 329 | int error) |
331 | { | 330 | { |
332 | xfs_ioend_t *ioend = bio->bi_private; | 331 | xfs_ioend_t *ioend = bio->bi_private; |
333 | 332 | ||
334 | if (bio->bi_size) | ||
335 | return 1; | ||
336 | |||
337 | ASSERT(atomic_read(&bio->bi_cnt) >= 1); | 333 | ASSERT(atomic_read(&bio->bi_cnt) >= 1); |
338 | ioend->io_error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? 0 : error; | 334 | ioend->io_error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? 0 : error; |
339 | 335 | ||
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c index b0f0e58866de..6a75f4d984a1 100644 --- a/fs/xfs/linux-2.6/xfs_buf.c +++ b/fs/xfs/linux-2.6/xfs_buf.c | |||
@@ -1106,16 +1106,12 @@ _xfs_buf_ioend( | |||
1106 | STATIC int | 1106 | STATIC int |
1107 | xfs_buf_bio_end_io( | 1107 | xfs_buf_bio_end_io( |
1108 | struct bio *bio, | 1108 | struct bio *bio, |
1109 | unsigned int bytes_done, | ||
1110 | int error) | 1109 | int error) |
1111 | { | 1110 | { |
1112 | xfs_buf_t *bp = (xfs_buf_t *)bio->bi_private; | 1111 | xfs_buf_t *bp = (xfs_buf_t *)bio->bi_private; |
1113 | unsigned int blocksize = bp->b_target->bt_bsize; | 1112 | unsigned int blocksize = bp->b_target->bt_bsize; |
1114 | struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1; | 1113 | struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1; |
1115 | 1114 | ||
1116 | if (bio->bi_size) | ||
1117 | return 1; | ||
1118 | |||
1119 | if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) | 1115 | if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) |
1120 | bp->b_error = EIO; | 1116 | bp->b_error = EIO; |
1121 | 1117 | ||