| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | 1. test_bit was used to return true boolean value, if |
| 2 | BIO_UPTODATE bit of bio->bi_flags is set. But the same |
| 3 | job can be done by checking bio->bi_error, implemented in |
| 4 | linux kernel 4.3 and above. If bio->bi_error is set, then |
| 5 | it denotes error. |
| 6 | |
| 7 | Ref: https://github.com/torvalds/linux/commit/4246a0b63bd8f56a1469b12eafeb875b1041a451 |
| 8 | |
| 9 | It solves below build error: |
| 10 | -- snip -- |
| 11 | iscsitarget-1.4.20.3+svn502/kernel/block-io.c:40:19: error: 'BIO_UPTODATE' undeclared (first use in this function) |
| 12 | error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? error : -EIO; |
| 13 | -- CUT -- |
| 14 | |
| 15 | 2. bio can always be filled to a maximum value of BIO_MAX_PAGES, |
| 16 | so no need to check for min value for linux kernel 4.3 and above. |
| 17 | |
| 18 | Ref: https://github.com/torvalds/linux/commit/b54ffb73cadcdcff9cc1ae0e11f502407e3e2e4c |
| 19 | |
| 20 | It solves below build error: |
| 21 | -- snip -- |
| 22 | iscsitarget-1.4.20.3+svn502/kernel/block-io.c:80:15: error: implicit declaration of function 'bio_get_nr_vecs' [-Werror=implicit-function-declaration] |
| 23 | max_pages = bio_get_nr_vecs(bio_data->bdev); |
| 24 | -- CUT -- |
| 25 | |
| 26 | Upstream-Status: Pending |
| 27 | |
| 28 | Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> |
| 29 | |
| 30 | diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/block-io.c iscsitarget-1.4.20.3+svn502/kernel/block-io.c |
| 31 | --- iscsitarget-1.4.20.3+svn502_org/kernel/block-io.c 2016-04-01 09:07:12.891810059 +0530 |
| 32 | +++ iscsitarget-1.4.20.3+svn502/kernel/block-io.c 2016-04-01 09:15:59.076469313 +0530 |
| 33 | @@ -33,7 +33,11 @@ static void blockio_bio_endio(struct bio |
| 34 | { |
| 35 | struct tio_work *tio_work = bio->bi_private; |
| 36 | |
| 37 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) |
| 38 | + error = bio->bi_error ? -EIO : error; |
| 39 | +#else |
| 40 | error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? error : -EIO; |
| 41 | +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) */ |
| 42 | |
| 43 | if (error) |
| 44 | atomic_set(&tio_work->error, error); |
| 45 | @@ -61,6 +65,10 @@ blockio_make_request(struct iet_volume * |
| 46 | u32 size = tio->size; |
| 47 | u32 tio_index = 0; |
| 48 | |
| 49 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) |
| 50 | + int err = 0; |
| 51 | + loff_t ppos = tio->offset; |
| 52 | +#else |
| 53 | int max_pages = 1; |
| 54 | int err = 0; |
| 55 | |
| 56 | @@ -69,6 +77,7 @@ blockio_make_request(struct iet_volume * |
| 57 | /* Calculate max_pages for bio_alloc (memory saver) */ |
| 58 | if (bdev_q) |
| 59 | max_pages = bio_get_nr_vecs(bio_data->bdev); |
| 60 | +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) */ |
| 61 | |
| 62 | tio_work = kzalloc(sizeof (*tio_work), GFP_KERNEL); |
| 63 | if (!tio_work) |
| 64 | @@ -80,7 +89,11 @@ blockio_make_request(struct iet_volume * |
| 65 | |
| 66 | /* Main processing loop, allocate and fill all bios */ |
| 67 | while (size && tio_index < tio->pg_cnt) { |
| 68 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) |
| 69 | + bio = bio_alloc(GFP_KERNEL, BIO_MAX_PAGES); |
| 70 | +#else |
| 71 | bio = bio_alloc(GFP_KERNEL, min(max_pages, BIO_MAX_PAGES)); |
| 72 | +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) */ |
| 73 | if (!bio) { |
| 74 | err = -ENOMEM; |
| 75 | goto out; |