openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

dm: simplify __process_abnormal_io() 

Only call bio_op() once in switch statement.  Also remove the
excessive factoring out to one line functions.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Mike Snitzer 2020-09-15 21:56:29 -04:00
parent 828678b87e
commit 9679b5a7ec
1 changed files with 17 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
drivers/md/dm.c
View File

@ -1474,28 +1474,6 @@ static int __clone_and_map_data_bio(struct clone_info *ci, struct dm_target *ti,
return 0; return 0;
} }
typedef unsigned (*get_num_bios_fn)(struct dm_target *ti);
static unsigned get_num_discard_bios(struct dm_target *ti)
{
return ti->num_discard_bios;
}
static unsigned get_num_secure_erase_bios(struct dm_target *ti)
{
return ti->num_secure_erase_bios;
}
static unsigned get_num_write_same_bios(struct dm_target *ti)
{
return ti->num_write_same_bios;
}
static unsigned get_num_write_zeroes_bios(struct dm_target *ti)
{
return ti->num_write_zeroes_bios;
}
static int __send_changing_extent_only(struct clone_info *ci, struct dm_target *ti, static int __send_changing_extent_only(struct clone_info *ci, struct dm_target *ti,
unsigned num_bios) unsigned num_bios)
{ {
@ -1521,26 +1499,6 @@ static int __send_changing_extent_only(struct clone_info *ci, struct dm_target *
return 0; return 0;
} }
static int __send_discard(struct clone_info *ci, struct dm_target *ti)
{
return __send_changing_extent_only(ci, ti, get_num_discard_bios(ti));
}
static int __send_secure_erase(struct clone_info *ci, struct dm_target *ti)
{
return __send_changing_extent_only(ci, ti, get_num_secure_erase_bios(ti));
}
static int __send_write_same(struct clone_info *ci, struct dm_target *ti)
{
return __send_changing_extent_only(ci, ti, get_num_write_same_bios(ti));
}
static int __send_write_zeroes(struct clone_info *ci, struct dm_target *ti)
{
return __send_changing_extent_only(ci, ti, get_num_write_zeroes_bios(ti));
}
static bool is_abnormal_io(struct bio *bio) static bool is_abnormal_io(struct bio *bio)
{ {
bool r = false; bool r = false;
@ -1561,18 +1519,26 @@ static bool __process_abnormal_io(struct clone_info *ci, struct dm_target *ti,
int *result) int *result)
{ {
struct bio *bio = ci->bio; struct bio *bio = ci->bio;
unsigned num_bios = 0;
if (bio_op(bio) == REQ_OP_DISCARD) switch (bio_op(bio)) {
*result = __send_discard(ci, ti); case REQ_OP_DISCARD:
else if (bio_op(bio) == REQ_OP_SECURE_ERASE) num_bios = ti->num_discard_bios;
*result = __send_secure_erase(ci, ti); break;
else if (bio_op(bio) == REQ_OP_WRITE_SAME) case REQ_OP_SECURE_ERASE:
*result = __send_write_same(ci, ti); num_bios = ti->num_secure_erase_bios;
else if (bio_op(bio) == REQ_OP_WRITE_ZEROES) break;
*result = __send_write_zeroes(ci, ti); case REQ_OP_WRITE_SAME:
else num_bios = ti->num_write_same_bios;
break;
case REQ_OP_WRITE_ZEROES:
num_bios = ti->num_write_zeroes_bios;
break;
default:
return false; return false;
}
*result = __send_changing_extent_only(ci, ti, num_bios);
return true; return true;
} }