mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Stefan Haberland <sth@linux.ibm.com>,
	axboe@kernel.dk, hoeppner@linux.ibm.com,
	linux-s390@vger.kernel.org, heiko.carstens@de.ibm.com,
	gor@linux.ibm.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4 2/2] s390/dasd: remove ioctl_by_bdev calls
Date: Wed, 7 Oct 2020 14:23:52 +0200	[thread overview]
Message-ID: <57c35578-fb46-92f0-c1b8-9a3ee1a9e7ae@de.ibm.com> (raw)
In-Reply-To: <20201007121403.GA30795@lst.de>



On 07.10.20 14:14, Christoph Hellwig wrote:
> On Wed, Oct 07, 2020 at 02:09:18PM +0200, Christian Borntraeger wrote:
>> Unfortunately not. On insmodding virtio_blk I do get:
> 
> Yeah, the symbol_put needs to be conditional as well.  New version below:

Yes, this works.
> 
> 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 12:24 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-19 14:22 [PATCH v4 0/2] s390/dasd: remove ioctl_by_bdev from DASD driver Stefan Haberland
2020-05-19 14:22 ` [PATCH v4 1/2] dasd: refactor dasd_ioctl_information Stefan Haberland
2020-05-19 14:22 ` [PATCH v4 2/2] s390/dasd: remove ioctl_by_bdev calls Stefan Haberland
2020-05-19 14:29   ` Christoph Hellwig
2020-10-07  9:34   ` Christian Borntraeger
2020-10-07 10:39     ` Christoph Hellwig
2020-10-07 10:44       ` Christian Borntraeger
2020-10-07 11:09         ` Stefan Haberland
2020-10-07 12:00         ` Christoph Hellwig
2020-10-07 12:09           ` Christian Borntraeger
2020-10-07 12:14             ` Christoph Hellwig
2020-10-07 12:23               ` Christian Borntraeger [this message]
2020-05-19 14:33 ` [PATCH 3/2] block: remove ioctl_by_bdev Christoph Hellwig
2020-05-19 19:03   ` Al Viro
2020-05-19 19:29     ` Christoph Hellwig
2020-05-21 14:22 ` [PATCH v4 0/2] s390/dasd: remove ioctl_by_bdev from DASD driver Jens Axboe

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=57c35578-fb46-92f0-c1b8-9a3ee1a9e7ae@de.ibm.com \
    --to=borntraeger@de.ibm.com \
    --cc=axboe@kernel.dk \
    --cc=gor@linux.ibm.com \
    --cc=hch@lst.de \
    --cc=heiko.carstens@de.ibm.com \
    --cc=hoeppner@linux.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=sth@linux.ibm.com \
    /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

all inboxes | Powered by JetHome®