fix kABI breakage caused by "block: use an atomic_t for mq_freeze_depth"

Orabug: 22913653

The aforementioned commit changed the type of "mq_freeze_depth" from
"int" to "atomic_t", thereby breaking kABI.  The types are the same
size, and third-party module code should not be fiddling with this
field's value.  This commit adds the usual "__GENKSYMS__" armor to
hide the type change from the kABI checker.

Signed-off-by: Dan Duval <dan.duval@oracle.com>

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index f85197afe2570285dcb9e27bb0cad0dd647216e4..7cd97608442ba2ff977b1b55b105615086328938 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -477,7 +477,11 @@ struct request_queue {
        struct mutex            sysfs_lock;
 
        int                     bypass_depth;
+#ifdef __GENKSYMS__
+       int                     mq_freeze_depth;
+#else
        atomic_t                mq_freeze_depth;
+#endif
 
 #if defined(CONFIG_BLK_DEV_BSG)
        bsg_job_fn              *bsg_job_fn;