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

if: adapt to new blk_queue_split()

This commit is contained in:
Thomas Schoebel-Theuer 2019-02-21 12:45:57 +01:00 committed by Thomas Schoebel-Theuer
parent 35b246a9fc
commit 4f1e7ce362
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/compat.h
View File

@ -130,6 +130,13 @@ extern int _compat_unlink(
#ifndef BIO_UPTODATE #ifndef BIO_UPTODATE
#define NEED_BIO_SPLIT #define NEED_BIO_SPLIT
#endif #endif
/* Adapt to modification of blk_queue_split() in
* af67c31fba3b879b241536a48df703a2eee18ebf
* detected via f4560ffe8cec1361b1021d81aca6a4173f8e7c87
*/
#ifdef QUEUE_FLAG_QUIESCED
#define MARS_HAS_BIO_SPLIT2
#endif
/* adapt to 4e1b2d52a80d79296a5d899d73249748dea71a53 and many others */ /* adapt to 4e1b2d52a80d79296a5d899d73249748dea71a53 and many others */
#ifdef bio_op #ifdef bio_op

4
kernel/mars_if.c
View File

@ -899,7 +899,11 @@ blk_qc_t if_make_request(struct request_queue *q, struct bio *bio)
void if_make_request(struct request_queue *q, struct bio *bio) void if_make_request(struct request_queue *q, struct bio *bio)
#endif #endif
{ {
#ifdef MARS_HAS_BIO_SPLIT2
blk_queue_split(q, &bio);
#else
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio, q->bio_split);
#endif
#ifdef BLK_QC_T_NONE #ifdef BLK_QC_T_NONE
return _if_make_request(q, bio); return _if_make_request(q, bio);
#else #else