Re: [PATCH] mmc:Fix error handling in the function mmc_blk_remove

Re: [PATCH] mmc:Fix error handling in the function mmc_blk_remove

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1605 bytes --]

On Tue, 2015-07-21 at 14:51 -0400, Nicholas Krause wrote:
> This fixes error handling in the function mmc_blk_remove by
> checking the return value of the call to mmc_blk_part_switch
> and if it has failed by returning a error code we now print
> out on the console to the user that removed the mmc device
> has failed before returning immediately.
> v2
> Change pr_crit to preferred dev_crit for when printing to console
> in device functions
> Remove unneeded return statement after dev_crit statement due to
> removal functions always needing to complete successfully
> 
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
>  drivers/mmc/card/block.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
> index c9c3d20..5b50ddf 100644
> --- a/drivers/mmc/card/block.c
> +++ b/drivers/mmc/card/block.c
> @@ -2505,10 +2505,10 @@ static void mmc_blk_remove(struct mmc_card *card)
>  {
>  > 	> struct mmc_blk_data *md = dev_get_drvdata(&card->dev);
>  
> -> 	> mmc_blk_remove_parts(card, md);

No.

Ben.

>  	pm_runtime_get_sync(&card->dev);
>  > 	> mmc_claim_host(card->host);
> -> 	> mmc_blk_part_switch(card, md);
> +> 	> if (mmc_blk_part_switch(card, md))
> +> 	> 	> dev_crit(&card->dev, "Unable to successfully remove due to failed mmc_blk_part_switch call\n");
>  > 	> mmc_release_host(card->host);
>  > 	> if (card->type != MMC_TYPE_SD_COMBO)
>  > 	> 	> pm_runtime_disable(&card->dev);
-- 
Ben Hutchings
No political challenge can be met by shopping. - George Monbiot


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

Re: [PATCH] mmc:Fix error handling in the function mmc_blk_remove

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1548 bytes --]

On Tue, 2015-07-21 at 09:29 -0400, Nicholas Krause wrote:
> This fixes error handling in the function mmc_blk_remove by
> checking the return value of the call to mmc_blk_part_switch
> and if it has failed by returning a error code we now print
> out on the console to the user that removed the mmc device
> has failed before returning immediately.

A removal function isn't allowed to fail.  Printing an error message
seems reasonable (though it should be printed using one of the dev_
logging functions), but returning early is not.

Ben.

> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
>  drivers/mmc/card/block.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
> index c9c3d20..24af338 100644
> --- a/drivers/mmc/card/block.c
> +++ b/drivers/mmc/card/block.c
> @@ -2508,7 +2508,10 @@ static void mmc_blk_remove(struct mmc_card *card)
>  > 	> mmc_blk_remove_parts(card, md);
>  > 	> pm_runtime_get_sync(&card->dev);
>  > 	> mmc_claim_host(card->host);
> -> 	> mmc_blk_part_switch(card, md);
> +> 	> if (mmc_blk_part_switch(card, md)) {
> +> 	> 	> pr_crit("Unable to successfully remove %s due to failed mmc_blk_part_switch call\n", card->part[MMC_NUM_PHY_PARTITION].name);
> +> 	> 	> return;
> +> 	> }
>  > 	> mmc_release_host(card->host);
>  > 	> if (card->type != MMC_TYPE_SD_COMBO)
>  > 	> 	> pm_runtime_disable(&card->dev);
-- 
Ben Hutchings
No political challenge can be met by shopping. - George Monbiot


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]