* [PATCH] md: raid10: add prerequisite to run underneath dm-raid
@ 2016-05-03 17:43 heinzm
0 siblings, 0 replies; 6+ messages in thread
From: heinzm @ 2016-05-03 17:43 UTC (permalink / raw)
To: linux-kernel; +Cc: Heinz Mauelshagen
From: Heinz Mauelshagen <heinzm@redhat.com>
In case md runs underneath the dm-raid target, the mddev does not have
a request queue or gendisk, thus avoid accesses to it.
This patch adds two missing conditionals to the raid10 personality.
Signed-of-by: Heinz Mauelshagen <heinzm@redhat.com>
---
drivers/md/raid10.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index e3fd725..84e24e6 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3782,8 +3782,10 @@ static int raid10_resize(struct mddev *mddev, sector_t sectors)
return ret;
}
md_set_array_sectors(mddev, size);
- set_capacity(mddev->gendisk, mddev->array_sectors);
- revalidate_disk(mddev->gendisk);
+ if (mddev->queue) {
+ set_capacity(mddev->gendisk, mddev->array_sectors);
+ revalidate_disk(mddev->gendisk);
+ }
if (sectors > mddev->dev_sectors &&
mddev->recovery_cp > oldsize) {
mddev->recovery_cp = oldsize;
@@ -4593,8 +4595,10 @@ static void raid10_finish_reshape(struct mddev *mddev)
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
}
mddev->resync_max_sectors = size;
- set_capacity(mddev->gendisk, mddev->array_sectors);
- revalidate_disk(mddev->gendisk);
+ if (mddev->queue) {
+ set_capacity(mddev->gendisk, mddev->array_sectors);
+ revalidate_disk(mddev->gendisk);
+ }
} else {
int d;
for (d = conf->geo.raid_disks ;
--
2.5.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] md: raid10: add prerequisite to run underneath dm-raid
@ 2016-05-09 15:50 heinzm
0 siblings, 0 replies; 6+ messages in thread
From: heinzm @ 2016-05-09 15:50 UTC (permalink / raw)
To: dm-devel; +Cc: Heinz Mauelshagen
From: Heinz Mauelshagen <heinzm@redhat.com>
In case md runs underneath the dm-raid target, the mddev does not have
a request queue or gendisk, thus avoid accesses to it.
This patch adds two missing conditionals to the raid10 personality.
Signed-of-by: Heinz Mauelshagen <heinzm@redhat.com>
---
drivers/md/raid10.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index e3fd725..84e24e6 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3782,8 +3782,10 @@ static int raid10_resize(struct mddev *mddev, sector_t sectors)
return ret;
}
md_set_array_sectors(mddev, size);
- set_capacity(mddev->gendisk, mddev->array_sectors);
- revalidate_disk(mddev->gendisk);
+ if (mddev->queue) {
+ set_capacity(mddev->gendisk, mddev->array_sectors);
+ revalidate_disk(mddev->gendisk);
+ }
if (sectors > mddev->dev_sectors &&
mddev->recovery_cp > oldsize) {
mddev->recovery_cp = oldsize;
@@ -4593,8 +4595,10 @@ static void raid10_finish_reshape(struct mddev *mddev)
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
}
mddev->resync_max_sectors = size;
- set_capacity(mddev->gendisk, mddev->array_sectors);
- revalidate_disk(mddev->gendisk);
+ if (mddev->queue) {
+ set_capacity(mddev->gendisk, mddev->array_sectors);
+ revalidate_disk(mddev->gendisk);
+ }
} else {
int d;
for (d = conf->geo.raid_disks ;
--
2.5.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] md: raid10: add prerequisite to run underneath dm-raid
@ 2016-05-09 15:50 heinzm
0 siblings, 0 replies; 6+ messages in thread
From: heinzm @ 2016-05-09 15:50 UTC (permalink / raw)
To: linux-raid; +Cc: Heinz Mauelshagen
From: Heinz Mauelshagen <heinzm@redhat.com>
In case md runs underneath the dm-raid target, the mddev does not have
a request queue or gendisk, thus avoid accesses to it.
This patch adds two missing conditionals to the raid10 personality.
Signed-of-by: Heinz Mauelshagen <heinzm@redhat.com>
---
drivers/md/raid10.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index e3fd725..84e24e6 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3782,8 +3782,10 @@ static int raid10_resize(struct mddev *mddev, sector_t sectors)
return ret;
}
md_set_array_sectors(mddev, size);
- set_capacity(mddev->gendisk, mddev->array_sectors);
- revalidate_disk(mddev->gendisk);
+ if (mddev->queue) {
+ set_capacity(mddev->gendisk, mddev->array_sectors);
+ revalidate_disk(mddev->gendisk);
+ }
if (sectors > mddev->dev_sectors &&
mddev->recovery_cp > oldsize) {
mddev->recovery_cp = oldsize;
@@ -4593,8 +4595,10 @@ static void raid10_finish_reshape(struct mddev *mddev)
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
}
mddev->resync_max_sectors = size;
- set_capacity(mddev->gendisk, mddev->array_sectors);
- revalidate_disk(mddev->gendisk);
+ if (mddev->queue) {
+ set_capacity(mddev->gendisk, mddev->array_sectors);
+ revalidate_disk(mddev->gendisk);
+ }
} else {
int d;
for (d = conf->geo.raid_disks ;
--
2.5.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] md: raid10: add prerequisite to run underneath dm-raid
2016-05-03 17:51 ` James Bottomley
@ 2016-05-03 17:58 ` Heinz Mauelshagen
0 siblings, 0 replies; 6+ messages in thread
From: Heinz Mauelshagen @ 2016-05-03 17:58 UTC (permalink / raw)
To: James Bottomley, linux-scsi
On 05/03/2016 07:51 PM, James Bottomley wrote:
> On Tue, 2016-05-03 at 19:42 +0200, heinzm@redhat.com wrote:
>> From: Heinz Mauelshagen <heinzm@redhat.com>
>>
>> In case md runs underneath the dm-raid target, the mddev does not
>> have a request queue or gendisk, thus avoid accesses to it.
>>
>> This patch adds two missing conditionals to the raid10 personality.
> -EWRONGLIST. drivers/md is handled by linux-raid@vger.kernel.org
Sorry for the noise...
>
> James
>
>> Signed-of-by: Heinz Mauelshagen <heinzm@redhat.com>
>>
>> ---
>> drivers/md/raid10.c | 12 ++++++++----
>> 1 file changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
>> index e3fd725..84e24e6 100644
>> --- a/drivers/md/raid10.c
>> +++ b/drivers/md/raid10.c
>> @@ -3782,8 +3782,10 @@ static int raid10_resize(struct mddev *mddev,
>> sector_t sectors)
>> return ret;
>> }
>> md_set_array_sectors(mddev, size);
>> - set_capacity(mddev->gendisk, mddev->array_sectors);
>> - revalidate_disk(mddev->gendisk);
>> + if (mddev->queue) {
>> + set_capacity(mddev->gendisk, mddev->array_sectors);
>> + revalidate_disk(mddev->gendisk);
>> + }
>> if (sectors > mddev->dev_sectors &&
>> mddev->recovery_cp > oldsize) {
>> mddev->recovery_cp = oldsize;
>> @@ -4593,8 +4595,10 @@ static void raid10_finish_reshape(struct mddev
>> *mddev)
>> set_bit(MD_RECOVERY_NEEDED, &mddev
>> ->recovery);
>> }
>> mddev->resync_max_sectors = size;
>> - set_capacity(mddev->gendisk, mddev->array_sectors);
>> - revalidate_disk(mddev->gendisk);
>> + if (mddev->queue) {
>> + set_capacity(mddev->gendisk, mddev
>> ->array_sectors);
>> + revalidate_disk(mddev->gendisk);
>> + }
>> } else {
>> int d;
>> for (d = conf->geo.raid_disks ;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] md: raid10: add prerequisite to run underneath dm-raid
2016-05-03 17:42 heinzm
@ 2016-05-03 17:51 ` James Bottomley
2016-05-03 17:58 ` Heinz Mauelshagen
0 siblings, 1 reply; 6+ messages in thread
From: James Bottomley @ 2016-05-03 17:51 UTC (permalink / raw)
To: heinzm, linux-scsi
On Tue, 2016-05-03 at 19:42 +0200, heinzm@redhat.com wrote:
> From: Heinz Mauelshagen <heinzm@redhat.com>
>
> In case md runs underneath the dm-raid target, the mddev does not
> have a request queue or gendisk, thus avoid accesses to it.
>
> This patch adds two missing conditionals to the raid10 personality.
-EWRONGLIST. drivers/md is handled by linux-raid@vger.kernel.org
James
>
> Signed-of-by: Heinz Mauelshagen <heinzm@redhat.com>
>
> ---
> drivers/md/raid10.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
> index e3fd725..84e24e6 100644
> --- a/drivers/md/raid10.c
> +++ b/drivers/md/raid10.c
> @@ -3782,8 +3782,10 @@ static int raid10_resize(struct mddev *mddev,
> sector_t sectors)
> return ret;
> }
> md_set_array_sectors(mddev, size);
> - set_capacity(mddev->gendisk, mddev->array_sectors);
> - revalidate_disk(mddev->gendisk);
> + if (mddev->queue) {
> + set_capacity(mddev->gendisk, mddev->array_sectors);
> + revalidate_disk(mddev->gendisk);
> + }
> if (sectors > mddev->dev_sectors &&
> mddev->recovery_cp > oldsize) {
> mddev->recovery_cp = oldsize;
> @@ -4593,8 +4595,10 @@ static void raid10_finish_reshape(struct mddev
> *mddev)
> set_bit(MD_RECOVERY_NEEDED, &mddev
> ->recovery);
> }
> mddev->resync_max_sectors = size;
> - set_capacity(mddev->gendisk, mddev->array_sectors);
> - revalidate_disk(mddev->gendisk);
> + if (mddev->queue) {
> + set_capacity(mddev->gendisk, mddev
> ->array_sectors);
> + revalidate_disk(mddev->gendisk);
> + }
> } else {
> int d;
> for (d = conf->geo.raid_disks ;
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] md: raid10: add prerequisite to run underneath dm-raid
@ 2016-05-03 17:42 heinzm
2016-05-03 17:51 ` James Bottomley
0 siblings, 1 reply; 6+ messages in thread
From: heinzm @ 2016-05-03 17:42 UTC (permalink / raw)
To: linux-scsi; +Cc: Heinz Mauelshagen
From: Heinz Mauelshagen <heinzm@redhat.com>
In case md runs underneath the dm-raid target, the mddev does not have
a request queue or gendisk, thus avoid accesses to it.
This patch adds two missing conditionals to the raid10 personality.
Signed-of-by: Heinz Mauelshagen <heinzm@redhat.com>
---
drivers/md/raid10.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index e3fd725..84e24e6 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3782,8 +3782,10 @@ static int raid10_resize(struct mddev *mddev, sector_t sectors)
return ret;
}
md_set_array_sectors(mddev, size);
- set_capacity(mddev->gendisk, mddev->array_sectors);
- revalidate_disk(mddev->gendisk);
+ if (mddev->queue) {
+ set_capacity(mddev->gendisk, mddev->array_sectors);
+ revalidate_disk(mddev->gendisk);
+ }
if (sectors > mddev->dev_sectors &&
mddev->recovery_cp > oldsize) {
mddev->recovery_cp = oldsize;
@@ -4593,8 +4595,10 @@ static void raid10_finish_reshape(struct mddev *mddev)
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
}
mddev->resync_max_sectors = size;
- set_capacity(mddev->gendisk, mddev->array_sectors);
- revalidate_disk(mddev->gendisk);
+ if (mddev->queue) {
+ set_capacity(mddev->gendisk, mddev->array_sectors);
+ revalidate_disk(mddev->gendisk);
+ }
} else {
int d;
for (d = conf->geo.raid_disks ;
--
2.5.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-05-09 15:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-03 17:43 [PATCH] md: raid10: add prerequisite to run underneath dm-raid heinzm
-- strict thread matches above, loose matches on Subject: below --
2016-05-09 15:50 heinzm
2016-05-09 15:50 heinzm
2016-05-03 17:42 heinzm
2016-05-03 17:51 ` James Bottomley
2016-05-03 17:58 ` Heinz Mauelshagen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.