Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Create.c s/major/major_num/ 

don't shadow the major() function by int major.

Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: Neil Brown <neilb@suse.de>
This commit is contained in:
maximilian attems 2007-09-21 19:32:19 +02:00 committed by Neil Brown
parent e39b673e48
commit 943eafefca
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Create.c
View File

@ -73,7 +73,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
unsigned long long bitmapsize; unsigned long long bitmapsize;
mdu_array_info_t array; mdu_array_info_t array;
int major = BITMAP_MAJOR_HI; int major_num = BITMAP_MAJOR_HI;
memset(&array, 0, sizeof(array)); memset(&array, 0, sizeof(array));
@ -422,7 +422,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
return 1; return 1;
if (bitmap_file && vers < 9003) { if (bitmap_file && vers < 9003) {
major = BITMAP_MAJOR_HOSTENDIAN; major_num = BITMAP_MAJOR_HOSTENDIAN;
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
fprintf(stderr, Name ": Warning - bitmaps created on this kernel are not portable\n" fprintf(stderr, Name ": Warning - bitmaps created on this kernel are not portable\n"
" between different architectured. Consider upgrading the Linux kernel.\n"); " between different architectured. Consider upgrading the Linux kernel.\n");
@ -436,7 +436,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
} }
if (!st->ss->add_internal_bitmap(st, super, &bitmap_chunk, if (!st->ss->add_internal_bitmap(st, super, &bitmap_chunk,
delay, write_behind, delay, write_behind,
bitmapsize, 1, major)) { bitmapsize, 1, major_num)) {
fprintf(stderr, Name ": Given bitmap chunk size not supported.\n"); fprintf(stderr, Name ": Given bitmap chunk size not supported.\n");
return 1; return 1;
} }
@ -466,7 +466,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
if (CreateBitmap(bitmap_file, force, (char*)uuid, bitmap_chunk, if (CreateBitmap(bitmap_file, force, (char*)uuid, bitmap_chunk,
delay, write_behind, delay, write_behind,
bitmapsize, bitmapsize,
major)) { major_num)) {
return 1; return 1;
} }
bitmap_fd = open(bitmap_file, O_RDWR); bitmap_fd = open(bitmap_file, O_RDWR);