TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: GKI: block: resolve ABI diff when CONFIG_BLK_DEV_BSG is unset

Browse Source 
If CONFIG_BLK_DEV_BSG is disabled on the vendor side, then struct
request_queue will have an ABI diff. Remove the #ifdef in the struct so
that vendors can choose whether or not to use the config.

'struct request_queue at blkdev.h:434:1' changed:¬
  type size changed from 17600 to 17920 (in bits)¬
  2 data member insertions:¬
    'bsg_job_fn* request_queue::bsg_job_fn', at offset 13952 (in bits) at blkdev.h:650:1¬
    'bsg_class_device request_queue::bsg_dev', at offset 14016 (in bits) at blkdev.h:651:1¬

Signed-off-by: Will McVicker <willmcvicker@google.com>
Bug: 152917514
Test: compile, verify ABI diff
Change-Id: Iec2e3460b717b667fcc0409cbc4ec985cfe0f69c
This commit is contained in:
Will McVicker
2020-03-31 17:23:26 -07:00
parent 2cde93c790
commit 7b8719ed1c
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/bsg.h
View File

@@ -6,7 +6,6 @@
struct request;
#ifdef CONFIG_BLK_DEV_BSG
struct bsg_ops {
int (*check_proto)(struct sg_io_v4 *hdr);
int (*fill_hdr)(struct request *rq, struct sg_io_v4 *hdr,
@@ -22,6 +21,7 @@ struct bsg_class_device {
const struct bsg_ops *ops;
};
#ifdef CONFIG_BLK_DEV_BSG
int bsg_register_queue(struct request_queue *q, struct device *parent,
const char *name, const struct bsg_ops *ops);
int bsg_scsi_register_queue(struct request_queue *q, struct device *parent);