diff options
| author | maximilian attems <max@stro.at> | 2007-09-21 19:32:19 +0200 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2007-09-24 13:21:38 +1000 |
| commit | 943eafefca3ea91e42f245ff4d9b4ca8f8c7146e (patch) | |
| tree | 357f7418affda60722886187c33cb879919bdf5a | |
| parent | e39b673e4892ef0085a8e59eee89d42e6191a688 (diff) | |
| download | mdadm-943eafefca3ea91e42f245ff4d9b4ca8f8c7146e.tar.gz mdadm-943eafefca3ea91e42f245ff4d9b4ca8f8c7146e.tar.xz mdadm-943eafefca3ea91e42f245ff4d9b4ca8f8c7146e.zip | |
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>
| -rw-r--r-- | Create.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -73,7 +73,7 @@ int Create(struct supertype *st, char *mddev, int mdfd, unsigned long long bitmapsize; mdu_array_info_t array; - int major = BITMAP_MAJOR_HI; + int major_num = BITMAP_MAJOR_HI; memset(&array, 0, sizeof(array)); @@ -422,7 +422,7 @@ int Create(struct supertype *st, char *mddev, int mdfd, return 1; if (bitmap_file && vers < 9003) { - major = BITMAP_MAJOR_HOSTENDIAN; + major_num = BITMAP_MAJOR_HOSTENDIAN; #ifdef __BIG_ENDIAN fprintf(stderr, Name ": Warning - bitmaps created on this kernel are not portable\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, delay, write_behind, - bitmapsize, 1, major)) { + bitmapsize, 1, major_num)) { fprintf(stderr, Name ": Given bitmap chunk size not supported.\n"); return 1; } @@ -466,7 +466,7 @@ int Create(struct supertype *st, char *mddev, int mdfd, if (CreateBitmap(bitmap_file, force, (char*)uuid, bitmap_chunk, delay, write_behind, bitmapsize, - major)) { + major_num)) { return 1; } bitmap_fd = open(bitmap_file, O_RDWR); |