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
slub: avoid label inside conditional
[firefly-linux-kernel-4.4.55.git]
/
block
/
blk-merge.c
diff --git
a/block/blk-merge.c
b/block/blk-merge.c
index ea85e20d5e9462be965f3f117bd7c3efcf51aa57..cfcc37cb222b63722bc048814c0f392205d1a898 100644
(file)
--- a/
block/blk-merge.c
+++ b/
block/blk-merge.c
@@
-465,3
+465,9
@@
int attempt_front_merge(struct request_queue *q, struct request *rq)
return 0;
}
+
+int blk_attempt_req_merge(struct request_queue *q, struct request *rq,
+ struct request *next)
+{
+ return attempt_merge(q, rq, next);
+}