RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bio: adapt bio_endio() to kernel 4.3

This commit is contained in:
Thomas Schoebel-Theuer 2015-09-29 08:20:06 +02:00
parent d04e8e23c4
commit 500ddbc97f
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/mars_bio.c
View File

@ -45,6 +45,10 @@
#ifdef __bvec_iter_bvec #ifdef __bvec_iter_bvec
#define HAS_BVEC_ITER #define HAS_BVEC_ITER
#endif #endif
/* adaptation to 4246a0b63bd8f56a1469b12eafeb875b1041a451 */
#ifndef bio_io_error
#define HAS_BI_ERROR
#endif
// end_remove_this // end_remove_this
static struct timing_stats timings[2] = {}; static struct timing_stats timings[2] = {};
@ -82,8 +86,17 @@ EXPORT_SYMBOL_GPL(bio_io_threshold);
/* This is called from the kernel bio layer. /* This is called from the kernel bio layer.
*/ */
// remove_this
#ifdef HAS_BI_ERROR
// end_remove_this
static
void bio_callback(struct bio *bio)
// remove_this
#else
static static
void bio_callback(struct bio *bio, int code) void bio_callback(struct bio *bio, int code)
#endif
// end_remove_this
{ {
struct bio_mref_aspect *mref_a = bio->bi_private; struct bio_mref_aspect *mref_a = bio->bi_private;
struct bio_brick *brick; struct bio_brick *brick;
@ -94,7 +107,15 @@ void bio_callback(struct bio *bio, int code)
brick = mref_a->output->brick; brick = mref_a->output->brick;
CHECK_PTR(brick, err); CHECK_PTR(brick, err);
// remove_this
#ifdef HAS_BI_ERROR
// end_remove_this
mref_a->status_code = bio->bi_error;
// remove_this
#else
mref_a->status_code = code; mref_a->status_code = code;
#endif
// end_remove_this
spin_lock_irqsave(&brick->lock, flags); spin_lock_irqsave(&brick->lock, flags);
list_del(&mref_a->io_head); list_del(&mref_a->io_head);