tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ublk: drop ublk_ctrl_start_recovery() header argument

ublk_ctrl_start_recovery() only uses its const struct ublksrv_ctrl_cmd *
header argument to log the dev_id. But this value is already available
in struct ublk_device's ub_number field. So log ub_number instead and
drop the unused header argument.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Caleb Sander Mateos and committed by
Jens Axboe 373df2c0 ed9f54cc

+3 -4
+3 -4
drivers/block/ublk_drv.c
··· 4872 4872 return ret; 4873 4873 } 4874 4874 4875 - static int ublk_ctrl_start_recovery(struct ublk_device *ub, 4876 - const struct ublksrv_ctrl_cmd *header) 4875 + static int ublk_ctrl_start_recovery(struct ublk_device *ub) 4877 4876 { 4878 4877 int ret = -EINVAL; 4879 4878 ··· 4901 4902 ret = -EBUSY; 4902 4903 goto out_unlock; 4903 4904 } 4904 - pr_devel("%s: start recovery for dev id %d.\n", __func__, header->dev_id); 4905 + pr_devel("%s: start recovery for dev id %d\n", __func__, ub->ub_number); 4905 4906 init_completion(&ub->completion); 4906 4907 ret = 0; 4907 4908 out_unlock: ··· 5282 5283 ret = ublk_ctrl_set_params(ub, &header); 5283 5284 break; 5284 5285 case UBLK_CMD_START_USER_RECOVERY: 5285 - ret = ublk_ctrl_start_recovery(ub, &header); 5286 + ret = ublk_ctrl_start_recovery(ub); 5286 5287 break; 5287 5288 case UBLK_CMD_END_USER_RECOVERY: 5288 5289 ret = ublk_ctrl_end_recovery(ub, &header);