Commit 757e3eb7 authored by Vladimir 'phcoder' Serbinenko's avatar Vladimir 'phcoder' Serbinenko
Browse files

* grub-core/disk/dmraid_nvidia.c: Fix potentially uninited "layout".

parent fb320faf
2013-10-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/dmraid_nvidia.c: Fix potentially uninited "layout".
2013-10-18 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-18 Vladimir Serbinenko <phcoder@gmail.com>
   
* include/grub/misc.h: Don't use warn_unused_result on gcc < 3.4. * include/grub/misc.h: Don't use warn_unused_result on gcc < 3.4.
...@@ -98,7 +98,6 @@ grub_dmraid_nv_detect (grub_disk_t disk, ...@@ -98,7 +98,6 @@ grub_dmraid_nv_detect (grub_disk_t disk,
grub_disk_addr_t sector; grub_disk_addr_t sector;
struct grub_nv_super sb; struct grub_nv_super sb;
int level; int level;
int layout;
grub_uint64_t disk_size; grub_uint64_t disk_size;
char *uuid; char *uuid;
...@@ -139,7 +138,6 @@ grub_dmraid_nv_detect (grub_disk_t disk, ...@@ -139,7 +138,6 @@ grub_dmraid_nv_detect (grub_disk_t disk,
case NV_LEVEL_5: case NV_LEVEL_5:
level = 5; level = 5;
layout = GRUB_RAID_LAYOUT_LEFT_ASYMMETRIC;
disk_size = sb.capacity / (sb.array.total_volumes - 1); disk_size = sb.capacity / (sb.array.total_volumes - 1);
break; break;
...@@ -164,7 +162,8 @@ grub_dmraid_nv_detect (grub_disk_t disk, ...@@ -164,7 +162,8 @@ grub_dmraid_nv_detect (grub_disk_t disk,
return grub_diskfilter_make_raid (sizeof (sb.array.signature), return grub_diskfilter_make_raid (sizeof (sb.array.signature),
uuid, sb.array.total_volumes, uuid, sb.array.total_volumes,
NULL, disk_size, NULL, disk_size,
sb.array.stripe_block_size, layout, sb.array.stripe_block_size,
GRUB_RAID_LAYOUT_LEFT_ASYMMETRIC,
level); level);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment