]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
fix kABI breakage caused by "block: generic request_queue reference counting"
authorDan Duval <dan.duval@oracle.com>
Fri, 9 Dec 2016 15:29:57 +0000 (10:29 -0500)
committerDan Duval <dan.duval@oracle.com>
Fri, 9 Dec 2016 15:29:57 +0000 (10:29 -0500)
Orabug: 22913653

Commit 3ef28e83ab15799742e55fd13243a5f678b04242 ("block: generic
request_queue reference counting") changed the name of an element of
the request_queue structure, and in so doing, broke kABI.

This patch uses __GENKSYMS__ to hide the change from the kABI
checker.

Signed-off-by: Dan Duval <dan.duval@oracle.com>
include/linux/blkdev.h

index 384b67059c83c288fb6983b0772adf41e1c3882e..b9710a2397ca23721e1fc7b71d5afc1dab5fcf5a 100644 (file)
@@ -495,7 +495,11 @@ struct request_queue {
 #endif
        struct rcu_head         rcu_head;
        wait_queue_head_t       mq_freeze_wq;
+#ifdef __GENKSYMS__
+       struct percpu_ref       mq_usage_counter;
+#else
        struct percpu_ref       q_usage_counter;
+#endif
        struct list_head        all_q_node;
 
        struct blk_mq_tag_set   *tag_set;