* [PATCH] imsm: fix: check if size of expansion is not larger than maximum
@ 2012-05-17 14:14 Lukasz Dorau
2012-05-18 3:42 ` NeilBrown
0 siblings, 1 reply; 4+ messages in thread
From: Lukasz Dorau @ 2012-05-17 14:14 UTC (permalink / raw)
To: neilb; +Cc: linux-raid, dan.j.williams, ed.ciechanowski
We do not check if requested size of expansion is larger than maximum
available size now. If it is larger the output message is a bit misleading,
for example:
mdadm: Cannot set size on array members.
mdadm: Cannot set device size for /dev/md/vol: Device or resource busy
Now we check if requested size of expansion is larger than maximum
available size and the appropriate output message was added.
Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
---
super-intel.c | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/super-intel.c b/super-intel.c
index 733bb38..6c87e20 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -9902,6 +9902,9 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
struct imsm_dev *dev;
struct intel_super *super;
long long current_size;
+ unsigned long long free_size;
+ long long max_size;
+ int rv;
getinfo_super_imsm_volume(st, &info, NULL);
if ((geo->level != info.array.level) &&
@@ -10015,28 +10018,33 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
super->current_vol, st->devnum);
goto analyse_change_exit;
}
+ /* check the maximum available size
+ */
+ rv = imsm_get_free_size(st, dev->vol.map->num_members,
+ 0, chunk, &free_size);
+ if (rv == 0)
+ /* Cannot find maximum available space
+ */
+ max_size = 0;
+ else {
+ max_size = free_size + current_size;
+ /* align component size
+ */
+ max_size = imsm_component_size_aligment_check(
+ get_imsm_raid_level(dev->vol.map),
+ chunk * 1024,
+ max_size);
+ }
if (geo->size == 0) {
/* requested size change to the maximum available size
*/
- unsigned long long freesize;
- int rv;
-
- rv = imsm_get_free_size(st, dev->vol.map->num_members,
- 0, chunk, &freesize);
- if (rv == 0) {
+ if (max_size == 0) {
fprintf(stderr, Name " Error. Cannot find "
"maximum available space.\n");
change = -1;
goto analyse_change_exit;
- }
- geo->size = freesize + current_size;
-
- /* align component size
- */
- geo->size = imsm_component_size_aligment_check(
- get_imsm_raid_level(dev->vol.map),
- chunk * 1024,
- geo->size);
+ } else
+ geo->size = max_size;
}
if ((direction == ROLLBACK_METADATA_CHANGES)) {
@@ -10057,6 +10065,15 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
current_size, geo->size);
goto analyse_change_exit;
}
+ if (max_size && geo->size > max_size) {
+ fprintf(stderr,
+ Name " Error. Requested size is larger "
+ "than maximum available size (maximum "
+ "available size is %llu, "
+ "requested size /rounded/ is %llu).\n",
+ max_size, geo->size);
+ goto analyse_change_exit;
+ }
}
geo->size *= data_disks;
geo->raid_disks = dev->vol.map->num_members;
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] imsm: fix: check if size of expansion is not larger than maximum
2012-05-17 14:14 [PATCH] imsm: fix: check if size of expansion is not larger than maximum Lukasz Dorau
@ 2012-05-18 3:42 ` NeilBrown
0 siblings, 0 replies; 4+ messages in thread
From: NeilBrown @ 2012-05-18 3:42 UTC (permalink / raw)
To: Lukasz Dorau; +Cc: linux-raid, dan.j.williams, ed.ciechanowski
[-- Attachment #1: Type: text/plain, Size: 3330 bytes --]
On Thu, 17 May 2012 16:14:00 +0200 Lukasz Dorau <lukasz.dorau@intel.com>
wrote:
> We do not check if requested size of expansion is larger than maximum
> available size now. If it is larger the output message is a bit misleading,
> for example:
> mdadm: Cannot set size on array members.
> mdadm: Cannot set device size for /dev/md/vol: Device or resource busy
> Now we check if requested size of expansion is larger than maximum
> available size and the appropriate output message was added.
>
> Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
Applied (the second, corrected one).
Thanks,
NeilBrown
> ---
> super-intel.c | 47 ++++++++++++++++++++++++++++++++---------------
> 1 files changed, 32 insertions(+), 15 deletions(-)
>
> diff --git a/super-intel.c b/super-intel.c
> index 733bb38..6c87e20 100644
> --- a/super-intel.c
> +++ b/super-intel.c
> @@ -9902,6 +9902,9 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
> struct imsm_dev *dev;
> struct intel_super *super;
> long long current_size;
> + unsigned long long free_size;
> + long long max_size;
> + int rv;
>
> getinfo_super_imsm_volume(st, &info, NULL);
> if ((geo->level != info.array.level) &&
> @@ -10015,28 +10018,33 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
> super->current_vol, st->devnum);
> goto analyse_change_exit;
> }
> + /* check the maximum available size
> + */
> + rv = imsm_get_free_size(st, dev->vol.map->num_members,
> + 0, chunk, &free_size);
> + if (rv == 0)
> + /* Cannot find maximum available space
> + */
> + max_size = 0;
> + else {
> + max_size = free_size + current_size;
> + /* align component size
> + */
> + max_size = imsm_component_size_aligment_check(
> + get_imsm_raid_level(dev->vol.map),
> + chunk * 1024,
> + max_size);
> + }
> if (geo->size == 0) {
> /* requested size change to the maximum available size
> */
> - unsigned long long freesize;
> - int rv;
> -
> - rv = imsm_get_free_size(st, dev->vol.map->num_members,
> - 0, chunk, &freesize);
> - if (rv == 0) {
> + if (max_size == 0) {
> fprintf(stderr, Name " Error. Cannot find "
> "maximum available space.\n");
> change = -1;
> goto analyse_change_exit;
> - }
> - geo->size = freesize + current_size;
> -
> - /* align component size
> - */
> - geo->size = imsm_component_size_aligment_check(
> - get_imsm_raid_level(dev->vol.map),
> - chunk * 1024,
> - geo->size);
> + } else
> + geo->size = max_size;
> }
>
> if ((direction == ROLLBACK_METADATA_CHANGES)) {
> @@ -10057,6 +10065,15 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
> current_size, geo->size);
> goto analyse_change_exit;
> }
> + if (max_size && geo->size > max_size) {
> + fprintf(stderr,
> + Name " Error. Requested size is larger "
> + "than maximum available size (maximum "
> + "available size is %llu, "
> + "requested size /rounded/ is %llu).\n",
> + max_size, geo->size);
> + goto analyse_change_exit;
> + }
> }
> geo->size *= data_disks;
> geo->raid_disks = dev->vol.map->num_members;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] imsm: fix: check if size of expansion is not larger than maximum
@ 2012-05-17 13:39 Lukasz Dorau
2012-05-17 14:09 ` Dorau, Lukasz
0 siblings, 1 reply; 4+ messages in thread
From: Lukasz Dorau @ 2012-05-17 13:39 UTC (permalink / raw)
To: neilb; +Cc: linux-raid, dan.j.williams, ed.ciechanowski
We do not check if requested size of expansion is larger than maximum
available size now. If it is larger the output message is a bit misleading,
for example:
mdadm: Cannot set size on array members.
mdadm: Cannot set device size for /dev/md/vol: Device or resource busy
Now we check if requested size of expansion is larger than maximum
available size and the appropriate output message was added.
Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
---
super-intel.c | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/super-intel.c b/super-intel.c
index 733bb38..52804ef 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -9902,6 +9902,9 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
struct imsm_dev *dev;
struct intel_super *super;
long long current_size;
+ unsigned long long free_size;
+ long long max_size;
+ int rv;
getinfo_super_imsm_volume(st, &info, NULL);
if ((geo->level != info.array.level) &&
@@ -10015,28 +10018,33 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
super->current_vol, st->devnum);
goto analyse_change_exit;
}
+ /* check the maximum available size
+ */
+ rv = imsm_get_free_size(st, dev->vol.map->num_members,
+ 0, chunk, &free_size);
+ if (rv == 0)
+ /* Cannot find maximum available space
+ */
+ max_size = 0;
+ else {
+ max_size = free_size + current_size;
+ /* align component size
+ */
+ max_size = imsm_component_size_aligment_check(
+ get_imsm_raid_level(dev->vol.map),
+ chunk * 1024,
+ max_size);
+ }
if (geo->size == 0) {
/* requested size change to the maximum available size
*/
- unsigned long long freesize;
- int rv;
-
- rv = imsm_get_free_size(st, dev->vol.map->num_members,
- 0, chunk, &freesize);
- if (rv == 0) {
+ if (max_size == 0) {
fprintf(stderr, Name " Error. Cannot find "
"maximum available space.\n");
change = -1;
goto analyse_change_exit;
- }
- geo->size = freesize + current_size;
-
- /* align component size
- */
- geo->size = imsm_component_size_aligment_check(
- get_imsm_raid_level(dev->vol.map),
- chunk * 1024,
- geo->size);
+ } else
+ geo->size = max_size;
}
if ((direction == ROLLBACK_METADATA_CHANGES)) {
@@ -10057,6 +10065,15 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
current_size, geo->size);
goto analyse_change_exit;
}
+ if (geo->size > max_size) {
+ fprintf(stderr,
+ Name " Error. Requested size is larger "
+ "than maximum available size (maximum "
+ "available size is %llu, "
+ "requested size /rounded/ is %llu).\n",
+ max_size, geo->size);
+ goto analyse_change_exit;
+ }
}
geo->size *= data_disks;
geo->raid_disks = dev->vol.map->num_members;
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [PATCH] imsm: fix: check if size of expansion is not larger than maximum
2012-05-17 13:39 Lukasz Dorau
@ 2012-05-17 14:09 ` Dorau, Lukasz
0 siblings, 0 replies; 4+ messages in thread
From: Dorau, Lukasz @ 2012-05-17 14:09 UTC (permalink / raw)
To: neilb@suse.de; +Cc: linux-raid@vger.kernel.org
On Thursday, May 17, 2012 3:39 PM Lukasz Dorau <lukasz.dorau@intel.com> wrote:
>
> We do not check if requested size of expansion is larger than maximum
> available size now. If it is larger the output message is a bit misleading,
> for example:
> mdadm: Cannot set size on array members.
> mdadm: Cannot set device size for /dev/md/vol: Device or resource busy
> Now we check if requested size of expansion is larger than maximum
> available size and the appropriate output message was added.
>
This patch has a small mistake.
I will send the corrected version in a while.
Lukasz
> ---
> super-intel.c | 47 ++++++++++++++++++++++++++++++++---------------
> 1 files changed, 32 insertions(+), 15 deletions(-)
>
> diff --git a/super-intel.c b/super-intel.c
> index 733bb38..52804ef 100644
> --- a/super-intel.c
> +++ b/super-intel.c
> @@ -9902,6 +9902,9 @@ enum imsm_reshape_type
> imsm_analyze_change(struct supertype *st,
> struct imsm_dev *dev;
> struct intel_super *super;
> long long current_size;
> + unsigned long long free_size;
> + long long max_size;
> + int rv;
>
> getinfo_super_imsm_volume(st, &info, NULL);
> if ((geo->level != info.array.level) &&
> @@ -10015,28 +10018,33 @@ enum imsm_reshape_type
> imsm_analyze_change(struct supertype *st,
> super->current_vol, st->devnum);
> goto analyse_change_exit;
> }
> + /* check the maximum available size
> + */
> + rv = imsm_get_free_size(st, dev->vol.map->num_members,
> + 0, chunk, &free_size);
> + if (rv == 0)
> + /* Cannot find maximum available space
> + */
> + max_size = 0;
> + else {
> + max_size = free_size + current_size;
> + /* align component size
> + */
> + max_size = imsm_component_size_aligment_check(
> + get_imsm_raid_level(dev->vol.map),
> + chunk * 1024,
> + max_size);
> + }
> if (geo->size == 0) {
> /* requested size change to the maximum available
> size
> */
> - unsigned long long freesize;
> - int rv;
> -
> - rv = imsm_get_free_size(st, dev->vol.map-
> >num_members,
> - 0, chunk, &freesize);
> - if (rv == 0) {
> + if (max_size == 0) {
> fprintf(stderr, Name " Error. Cannot find "
> "maximum available space.\n");
> change = -1;
> goto analyse_change_exit;
> - }
> - geo->size = freesize + current_size;
> -
> - /* align component size
> - */
> - geo->size = imsm_component_size_aligment_check(
> - get_imsm_raid_level(dev-
> >vol.map),
> - chunk * 1024,
> - geo->size);
> + } else
> + geo->size = max_size;
> }
>
> if ((direction == ROLLBACK_METADATA_CHANGES)) {
> @@ -10057,6 +10065,15 @@ enum imsm_reshape_type
> imsm_analyze_change(struct supertype *st,
> current_size, geo->size);
> goto analyse_change_exit;
> }
> + if (geo->size > max_size) {
> + fprintf(stderr,
> + Name " Error. Requested size is larger
> "
> + "than maximum available size
> (maximum "
> + "available size is %llu, "
> + "requested size /rounded/ is
> %llu).\n",
> + max_size, geo->size);
> + goto analyse_change_exit;
> + }
> }
> geo->size *= data_disks;
> geo->raid_disks = dev->vol.map->num_members;
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-raid" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-18 3:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-17 14:14 [PATCH] imsm: fix: check if size of expansion is not larger than maximum Lukasz Dorau
2012-05-18 3:42 ` NeilBrown
-- strict thread matches above, loose matches on Subject: below --
2012-05-17 13:39 Lukasz Dorau
2012-05-17 14:09 ` Dorau, Lukasz
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).