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

Commit a7ffb6a5 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Mike Snitzer
Browse files

dm table: make dm_table_supports_discards static 



The function dm_table_supports_discards is only called from
dm-table.c:dm_table_set_restrictions().  So move it above
dm_table_set_restrictions and make it static.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 895b47d7

drivers/md/dm-table.c

+37 −36
Original line number Diff line number Diff line
@@ -1430,6 +1430,43 @@ static bool dm_table_supports_write_same(struct dm_table *t) 
	return true;

}



static int device_discard_capable(struct dm_target *ti, struct dm_dev *dev,

				  sector_t start, sector_t len, void *data)

{

	struct request_queue *q = bdev_get_queue(dev->bdev);



	return q && blk_queue_discard(q);

}



static bool dm_table_supports_discards(struct dm_table *t)

{

	struct dm_target *ti;

	unsigned i = 0;



	/*

	 * Unless any target used by the table set discards_supported,

	 * require at least one underlying device to support discards.

	 * t->devices includes internal dm devices such as mirror logs

	 * so we need to use iterate_devices here, which targets

	 * supporting discard selectively must provide.

	 */

	while (i < dm_table_get_num_targets(t)) {

		ti = dm_table_get_target(t, i++);



		if (!ti->num_discard_bios)

			continue;



		if (ti->discards_supported)

			return 1;



		if (ti->type->iterate_devices &&

		    ti->type->iterate_devices(ti, device_discard_capable, NULL))

			return 1;

	}



	return 0;

}



void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,

			       struct queue_limits *limits)

{
@@ -1636,39 +1673,3 @@ void dm_table_run_md_queue_async(struct dm_table *t) 
}

EXPORT_SYMBOL(dm_table_run_md_queue_async);

static int device_discard_capable(struct dm_target *ti, struct dm_dev *dev,

				  sector_t start, sector_t len, void *data)

{

	struct request_queue *q = bdev_get_queue(dev->bdev);



	return q && blk_queue_discard(q);

}



bool dm_table_supports_discards(struct dm_table *t)

{

	struct dm_target *ti;

	unsigned i = 0;



	/*

	 * Unless any target used by the table set discards_supported,

	 * require at least one underlying device to support discards.

	 * t->devices includes internal dm devices such as mirror logs

	 * so we need to use iterate_devices here, which targets

	 * supporting discard selectively must provide.

	 */

	while (i < dm_table_get_num_targets(t)) {

		ti = dm_table_get_target(t, i++);



		if (!ti->num_discard_bios)

			continue;



		if (ti->discards_supported)

			return 1;



		if (ti->type->iterate_devices &&

		    ti->type->iterate_devices(ti, device_discard_capable, NULL))

			return 1;

	}



	return 0;

}

drivers/md/dm.h

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ int dm_table_any_busy_target(struct dm_table *t); 
unsigned dm_table_get_type(struct dm_table *t);

struct target_type *dm_table_get_immutable_target_type(struct dm_table *t);

bool dm_table_request_based(struct dm_table *t);

bool dm_table_supports_discards(struct dm_table *t);

void dm_table_free_md_mempools(struct dm_table *t);

struct dm_md_mempools *dm_table_get_md_mempools(struct dm_table *t);