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

Commit 3ef213ff authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by Amit Pundir
Browse files

ANDROID: dm: rename dm-linear methods for dm-android-verity 

This keeps linear_target as static variable and just exposes
the linear target methods for android-verity

Cherry-picked: https://android-review.googlesource.com/#/c/212858



Change-Id: I4a377e417b00afd9ecccdb3e605fea31a7df112e
Signed-off-by: default avatarBadhri Jagan Sridharan <Badhri@google.com>
(cherry picked from commit a6d1b091f40b25d97849487e29ec097bc5f568dd)
parent 146168ad

drivers/md/dm-android-verity.c

+7 −7
Original line number Diff line number Diff line
@@ -576,15 +576,15 @@ static int add_as_linear_device(struct dm_target *ti, char *dev) 
					DM_LINEAR_TARGET_OFFSET};

	int err = 0;



	android_verity_target.dtr = linear_target.dtr,

	android_verity_target.map = linear_target.map,

	android_verity_target.status = linear_target.status,

	android_verity_target.ioctl = linear_target.ioctl,

	android_verity_target.merge = linear_target.merge,

	android_verity_target.iterate_devices = linear_target.iterate_devices,

	android_verity_target.dtr = dm_linear_dtr,

	android_verity_target.map = dm_linear_map,

	android_verity_target.status = dm_linear_status,

	android_verity_target.ioctl = dm_linear_ioctl,

	android_verity_target.merge = dm_linear_merge,

	android_verity_target.iterate_devices = dm_linear_iterate_devices,

	android_verity_target.io_hints = NULL;



	err = linear_target.ctr(ti, DM_LINEAR_ARGS, linear_table_args);

	err = dm_linear_ctr(ti, DM_LINEAR_ARGS, linear_table_args);



	if (!err) {

		DMINFO("Added android-verity as a linear target");

drivers/md/dm-android-verity.h

+12 −0
Original line number Diff line number Diff line
@@ -94,4 +94,16 @@ struct bio_read { 
};



extern struct target_type linear_target;



extern void dm_linear_dtr(struct dm_target *ti);

extern int dm_linear_map(struct dm_target *ti, struct bio *bio);

extern void dm_linear_status(struct dm_target *ti, status_type_t type,

			unsigned status_flags, char *result, unsigned maxlen);

extern int dm_linear_ioctl(struct dm_target *ti, unsigned int cmd,

		unsigned long arg);

extern int dm_linear_merge(struct dm_target *ti, struct bvec_merge_data *bvm,

		struct bio_vec *biovec, int max_size);

extern int dm_linear_iterate_devices(struct dm_target *ti,

			iterate_devices_callout_fn fn, void *data);

extern int dm_linear_ctr(struct dm_target *ti, unsigned int argc, char **argv);

#endif /* DM_ANDROID_VERITY_H */

drivers/md/dm-linear.c

+13 −13
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct linear_c { 
/*

 * Construct a linear mapping: <dev_path> <offset>

 */

static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)

int dm_linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)

{

	struct linear_c *lc;

	unsigned long long tmp;
@@ -67,7 +67,7 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
	return ret;

}



static void linear_dtr(struct dm_target *ti)

void dm_linear_dtr(struct dm_target *ti)

{

	struct linear_c *lc = (struct linear_c *) ti->private;
@@ -92,14 +92,14 @@ static void linear_map_bio(struct dm_target *ti, struct bio *bio) 
			linear_map_sector(ti, bio->bi_iter.bi_sector);

}



static int linear_map(struct dm_target *ti, struct bio *bio)

int dm_linear_map(struct dm_target *ti, struct bio *bio)

{

	linear_map_bio(ti, bio);



	return DM_MAPIO_REMAPPED;

}



static void linear_status(struct dm_target *ti, status_type_t type,

void dm_linear_status(struct dm_target *ti, status_type_t type,

			  unsigned status_flags, char *result, unsigned maxlen)

{

	struct linear_c *lc = (struct linear_c *) ti->private;
@@ -116,7 +116,7 @@ static void linear_status(struct dm_target *ti, status_type_t type, 
	}

}



static int linear_prepare_ioctl(struct dm_target *ti,

static int dm_linear_prepare_ioctl(struct dm_target *ti,

		struct block_device **bdev, fmode_t *mode)

{

	struct linear_c *lc = (struct linear_c *) ti->private;
@@ -133,7 +133,7 @@ static int linear_prepare_ioctl(struct dm_target *ti, 
	return 0;

}



static int linear_iterate_devices(struct dm_target *ti,

int dm_linear_iterate_devices(struct dm_target *ti,

				  iterate_devices_callout_fn fn, void *data)

{

	struct linear_c *lc = ti->private;
@@ -159,16 +159,16 @@ static long linear_direct_access(struct dm_target *ti, sector_t sector, 
	return ret;

}



struct target_type linear_target = {

static struct target_type linear_target = {

	.name   = "linear",

	.version = {1, 3, 0},

	.module = THIS_MODULE,

	.ctr    = linear_ctr,

	.dtr    = linear_dtr,

	.map    = linear_map,

	.status = linear_status,

	.prepare_ioctl = linear_prepare_ioctl,

	.iterate_devices = linear_iterate_devices,

	.ctr    = dm_linear_ctr,

	.dtr    = dm_linear_dtr,

	.map    = dm_linear_map,

	.status = dm_linear_status,

	.prepare_ioctl  = dm_linear_prepare_ioctl,

	.iterate_devices = dm_linear_iterate_devices,

	.direct_access = linear_direct_access,

};