projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'byteswap-for-linus-20121219' of git://git.infradead.org/users/dwmw2/byteswap
[firefly-linux-kernel-4.4.55.git]
/
block
/
blk.h
diff --git
a/block/blk.h
b/block/blk.h
index ca51543b248ca16f0eb28e937ec321e52f3130c8..47fdfdd41520611f59caca02bfeb0623951fa9d5 100644
(file)
--- a/
block/blk.h
+++ b/
block/blk.h
@@
-96,7
+96,7
@@
static inline struct request *__elv_next_request(struct request_queue *q)
q->flush_queue_delayed = 1;
return NULL;
}
q->flush_queue_delayed = 1;
return NULL;
}
- if (unlikely(blk_queue_d
ead
(q)) ||
+ if (unlikely(blk_queue_d
ying
(q)) ||
!q->elevator->type->ops.elevator_dispatch_fn(q, 0))
return NULL;
}
!q->elevator->type->ops.elevator_dispatch_fn(q, 0))
return NULL;
}
@@
-145,6
+145,8
@@
int blk_try_merge(struct request *rq, struct bio *bio);
void blk_queue_congestion_threshold(struct request_queue *q);
void blk_queue_congestion_threshold(struct request_queue *q);
+void __blk_run_queue_uncond(struct request_queue *q);
+
int blk_dev_init(void);
int blk_dev_init(void);