Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b8719ed authored by Will McVicker's avatar Will McVicker
Browse files

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



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: default avatarWill McVicker <willmcvicker@google.com>
Bug: 152917514
Test: compile, verify ABI diff
Change-Id: Iec2e3460b717b667fcc0409cbc4ec985cfe0f69c
parent 2cde93c7

include/linux/blkdev.h

+0 −2
Original line number Diff line number Diff line
@@ -646,10 +646,8 @@ struct request_queue { 
	int			bypass_depth;

	atomic_t		mq_freeze_depth;



#if defined(CONFIG_BLK_DEV_BSG)

	bsg_job_fn		*bsg_job_fn;

	struct bsg_class_device bsg_dev;

#endif



#ifdef CONFIG_BLK_DEV_THROTTLING

	/* Throttle data */

include/linux/bsg.h

+1 −1
Original line number Diff line number Diff line
@@ -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);