linux-block.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Haberland <sth@linux.ibm.com>
To: Christoph Hellwig <hch@lst.de>, axboe@kernel.dk
Cc: linux-block@vger.kernel.org, linux-s390@vger.kernel.org,
	Christian Borntraeger <borntraeger@de.ibm.com>
Subject: Re: [PATCH] partitions/ibm: fix non-DASD devices
Date: Wed, 7 Oct 2020 15:14:11 +0200	[thread overview]
Message-ID: <60f3e36f-5c78-186b-870b-0b919bc22073@linux.ibm.com> (raw)
In-Reply-To: <20201007124009.1438269-1-hch@lst.de>

thanks for the quick fix

Reviewed-by: Stefan Haberland <sth@linux.ibm.com>


Am 07.10.20 um 14:40 schrieb Christoph Hellwig:
> Don't error out if the dasd_biodasdinfo symbol is not available.
>
> Fixes: 26d7e28e3820 ("s390/dasd: remove ioctl_by_bdev calls")
> Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
>  block/partitions/ibm.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/block/partitions/ibm.c b/block/partitions/ibm.c
> index d6e18df9c53c6d..4b044e620d3534 100644
> --- a/block/partitions/ibm.c
> +++ b/block/partitions/ibm.c
> @@ -305,8 +305,6 @@ int ibm_partition(struct parsed_partitions *state)
>  	if (!disk->fops->getgeo)
>  		goto out_exit;
>  	fn = symbol_get(dasd_biodasdinfo);
> -	if (!fn)
> -		goto out_exit;
>  	blocksize = bdev_logical_block_size(bdev);
>  	if (blocksize <= 0)
>  		goto out_symbol;
> @@ -326,7 +324,7 @@ int ibm_partition(struct parsed_partitions *state)
>  	geo->start = get_start_sect(bdev);
>  	if (disk->fops->getgeo(bdev, geo))
>  		goto out_freeall;
> -	if (fn(disk, info)) {
> +	if (!fn || fn(disk, info)) {
>  		kfree(info);
>  		info = NULL;
>  	}
> @@ -370,7 +368,8 @@ int ibm_partition(struct parsed_partitions *state)
>  out_nogeo:
>  	kfree(info);
>  out_symbol:
> -	symbol_put(dasd_biodasdinfo);
> +	if (fn)
> +		symbol_put(dasd_biodasdinfo);
>  out_exit:
>  	return res;
>  }


  reply	other threads:[~2020-10-07 13:14 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-07 12:40 [PATCH] partitions/ibm: fix non-DASD devices Christoph Hellwig
2020-10-07 13:14 ` Stefan Haberland [this message]
2020-10-07 13:53 ` Jens Axboe
2020-10-07 13:54   ` Christoph Hellwig
2020-10-07 13:54     ` Jens Axboe
2020-10-07 14:01       ` Christoph Hellwig
2020-10-07 14:02         ` Jens Axboe
2020-10-07 14:02         ` Christian Borntraeger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=60f3e36f-5c78-186b-870b-0b919bc22073@linux.ibm.com \
    --to=sth@linux.ibm.com \
    --cc=axboe@kernel.dk \
    --cc=borntraeger@de.ibm.com \
    --cc=hch@lst.de \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).