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

Commit c5b8dcde authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by Dmitry Shmidt
Browse files

ANDROID: dm: rebase for 4.9



Export the direct_access method of dm_linear target for
dm-android-verity target.

Signed-off-by: default avatarBadhri Jagan Sridharan <Badhri@google.com>
Change-Id: I46556d882305e5194352946264cbc9c06e5038e4
parent 48baaa32
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -635,6 +635,7 @@ static int add_as_linear_device(struct dm_target *ti, char *dev)
	android_verity_target.status = dm_linear_status,
	android_verity_target.prepare_ioctl = dm_linear_prepare_ioctl,
	android_verity_target.iterate_devices = dm_linear_iterate_devices,
        android_verity_target.direct_access = dm_linear_direct_access,
	android_verity_target.io_hints = NULL;

	err = dm_linear_ctr(ti, DM_LINEAR_ARGS, linear_table_args);
+2 −0
Original line number Diff line number Diff line
@@ -118,4 +118,6 @@ extern int dm_linear_prepare_ioctl(struct dm_target *ti,
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);
extern long dm_linear_direct_access(struct dm_target *ti, sector_t sector,
                                 void **kaddr, pfn_t *pfn, long size);
#endif /* DM_ANDROID_VERITY_H */
+3 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ int dm_linear_iterate_devices(struct dm_target *ti,
}
EXPORT_SYMBOL_GPL(dm_linear_iterate_devices);

static long linear_direct_access(struct dm_target *ti, sector_t sector,
long dm_linear_direct_access(struct dm_target *ti, sector_t sector,
				 void **kaddr, pfn_t *pfn, long size)
{
	struct linear_c *lc = ti->private;
@@ -164,6 +164,7 @@ static long linear_direct_access(struct dm_target *ti, sector_t sector,

	return ret;
}
EXPORT_SYMBOL_GPL(dm_linear_direct_access);

static struct target_type linear_target = {
	.name   = "linear",
@@ -175,7 +176,7 @@ static struct target_type linear_target = {
	.status = dm_linear_status,
	.prepare_ioctl = dm_linear_prepare_ioctl,
	.iterate_devices = dm_linear_iterate_devices,
	.direct_access = linear_direct_access,
	.direct_access = dm_linear_direct_access,
};

int __init dm_linear_init(void)