* [PATCH] partitions/ibm: fix non-DASD devices
@ 2020-10-07 12:40 Christoph Hellwig
2020-10-07 13:14 ` Stefan Haberland
2020-10-07 13:53 ` Jens Axboe
0 siblings, 2 replies; 8+ messages in thread
From: Christoph Hellwig @ 2020-10-07 12:40 UTC (permalink / raw)
To: axboe; +Cc: linux-block, sth, linux-s390, Christian Borntraeger
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;
}
--
2.28.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] partitions/ibm: fix non-DASD devices
2020-10-07 12:40 [PATCH] partitions/ibm: fix non-DASD devices Christoph Hellwig
@ 2020-10-07 13:14 ` Stefan Haberland
2020-10-07 13:53 ` Jens Axboe
1 sibling, 0 replies; 8+ messages in thread
From: Stefan Haberland @ 2020-10-07 13:14 UTC (permalink / raw)
To: Christoph Hellwig, axboe; +Cc: linux-block, linux-s390, Christian Borntraeger
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;
> }
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] partitions/ibm: fix non-DASD devices
2020-10-07 12:40 [PATCH] partitions/ibm: fix non-DASD devices Christoph Hellwig
2020-10-07 13:14 ` Stefan Haberland
@ 2020-10-07 13:53 ` Jens Axboe
2020-10-07 13:54 ` Christoph Hellwig
1 sibling, 1 reply; 8+ messages in thread
From: Jens Axboe @ 2020-10-07 13:53 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-block, sth, linux-s390, Christian Borntraeger
On 10/7/20 6:40 AM, Christoph Hellwig wrote:
> Don't error out if the dasd_biodasdinfo symbol is not available.
Should this be marked for 5.8-stable?
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] partitions/ibm: fix non-DASD devices
2020-10-07 13:53 ` Jens Axboe
@ 2020-10-07 13:54 ` Christoph Hellwig
2020-10-07 13:54 ` Jens Axboe
0 siblings, 1 reply; 8+ messages in thread
From: Christoph Hellwig @ 2020-10-07 13:54 UTC (permalink / raw)
To: Jens Axboe
Cc: Christoph Hellwig, linux-block, sth, linux-s390, Christian Borntraeger
On Wed, Oct 07, 2020 at 07:53:27AM -0600, Jens Axboe wrote:
> On 10/7/20 6:40 AM, Christoph Hellwig wrote:
> > Don't error out if the dasd_biodasdinfo symbol is not available.
>
> Should this be marked for 5.8-stable?
The Fixes tag should automatically take care of that.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] partitions/ibm: fix non-DASD devices
2020-10-07 13:54 ` Christoph Hellwig
@ 2020-10-07 13:54 ` Jens Axboe
2020-10-07 14:01 ` Christoph Hellwig
0 siblings, 1 reply; 8+ messages in thread
From: Jens Axboe @ 2020-10-07 13:54 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-block, sth, linux-s390, Christian Borntraeger
On 10/7/20 7:54 AM, Christoph Hellwig wrote:
> On Wed, Oct 07, 2020 at 07:53:27AM -0600, Jens Axboe wrote:
>> On 10/7/20 6:40 AM, Christoph Hellwig wrote:
>>> Don't error out if the dasd_biodasdinfo symbol is not available.
>>
>> Should this be marked for 5.8-stable?
>
> The Fixes tag should automatically take care of that.
Not if it's not marked for stable. Maybe auto-selection will pick it
up, but it's not a given.
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] partitions/ibm: fix non-DASD devices
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
0 siblings, 2 replies; 8+ messages in thread
From: Christoph Hellwig @ 2020-10-07 14:01 UTC (permalink / raw)
To: Jens Axboe
Cc: Christoph Hellwig, linux-block, sth, linux-s390, Christian Borntraeger
On Wed, Oct 07, 2020 at 07:54:45AM -0600, Jens Axboe wrote:
> On 10/7/20 7:54 AM, Christoph Hellwig wrote:
> > On Wed, Oct 07, 2020 at 07:53:27AM -0600, Jens Axboe wrote:
> >> On 10/7/20 6:40 AM, Christoph Hellwig wrote:
> >>> Don't error out if the dasd_biodasdinfo symbol is not available.
> >>
> >> Should this be marked for 5.8-stable?
> >
> > The Fixes tag should automatically take care of that.
>
> Not if it's not marked for stable. Maybe auto-selection will pick it
> up, but it's not a given.
Yes, trivial patches with a fixes tag get reliably picked out. But
if you don't trust the system feel free to add a stable tag.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] partitions/ibm: fix non-DASD devices
2020-10-07 14:01 ` Christoph Hellwig
@ 2020-10-07 14:02 ` Jens Axboe
2020-10-07 14:02 ` Christian Borntraeger
1 sibling, 0 replies; 8+ messages in thread
From: Jens Axboe @ 2020-10-07 14:02 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-block, sth, linux-s390, Christian Borntraeger
On 10/7/20 8:01 AM, Christoph Hellwig wrote:
> On Wed, Oct 07, 2020 at 07:54:45AM -0600, Jens Axboe wrote:
>> On 10/7/20 7:54 AM, Christoph Hellwig wrote:
>>> On Wed, Oct 07, 2020 at 07:53:27AM -0600, Jens Axboe wrote:
>>>> On 10/7/20 6:40 AM, Christoph Hellwig wrote:
>>>>> Don't error out if the dasd_biodasdinfo symbol is not available.
>>>>
>>>> Should this be marked for 5.8-stable?
>>>
>>> The Fixes tag should automatically take care of that.
>>
>> Not if it's not marked for stable. Maybe auto-selection will pick it
>> up, but it's not a given.
>
> Yes, trivial patches with a fixes tag get reliably picked out. But
> if you don't trust the system feel free to add a stable tag.
I prefer being explicit instead of assuming it'll get picked up.
I applied it for 5.9, added the tag.
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] partitions/ibm: fix non-DASD devices
2020-10-07 14:01 ` Christoph Hellwig
2020-10-07 14:02 ` Jens Axboe
@ 2020-10-07 14:02 ` Christian Borntraeger
1 sibling, 0 replies; 8+ messages in thread
From: Christian Borntraeger @ 2020-10-07 14:02 UTC (permalink / raw)
To: Christoph Hellwig, Jens Axboe; +Cc: linux-block, sth, linux-s390
On 07.10.20 16:01, Christoph Hellwig wrote:
> On Wed, Oct 07, 2020 at 07:54:45AM -0600, Jens Axboe wrote:
>> On 10/7/20 7:54 AM, Christoph Hellwig wrote:
>>> On Wed, Oct 07, 2020 at 07:53:27AM -0600, Jens Axboe wrote:
>>>> On 10/7/20 6:40 AM, Christoph Hellwig wrote:
>>>>> Don't error out if the dasd_biodasdinfo symbol is not available.
>>>>
>>>> Should this be marked for 5.8-stable?
>>>
>>> The Fixes tag should automatically take care of that.
>>
>> Not if it's not marked for stable. Maybe auto-selection will pick it
>> up, but it's not a given.
>
> Yes, trivial patches with a fixes tag get reliably picked out. But
> if you don't trust the system feel free to add a stable tag.
Yes, we want to have it for 5.8 stable, so a stable tag certainly does not hurt.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-10-07 14:03 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-07 12:40 [PATCH] partitions/ibm: fix non-DASD devices Christoph Hellwig
2020-10-07 13:14 ` Stefan Haberland
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
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).