Fix kabi issue for upstream commit ca369d51

Orabug: 23615929

When backport upstream commit ca369d51 'block/sd: Fix device-imposed
transfer length limits' it broken kabi, this patch fix kabi issue.

Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 6932b6da984798a64797efacd1a1fe16fa7f4a15..8943b73923554058c97260f607273642650bc1f1 100644 (file)
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -101,7 +101,7 @@ struct scsi_disk {
           * allow extending the structure while preserving ABI.
           */
 
-        UEK_KABI_RESERVED(1)
+       UEK_KABI_USE2(1, u32 opt_xfer_blocks, u32 unuse);
         UEK_KABI_RESERVED(2)
 };
 #define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev)

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index d78df14d857f257f0d3c8b760681096b6312d934..8448f38c3baef10ef7422d2d73f1a9cc546b1e84 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -313,7 +313,7 @@ struct queue_limits {
    * The following padding has been inserted before ABI freeze to
    * allow extending the structure while preserving ABI.
    */
-        UEK_KABI_RESERVED(1)
+       UEK_KABI_USE2(1, unsigned int max_dev_sectors, unsigned int unuse)
         UEK_KABI_RESERVED(2)
 };