From 943eafefca3ea91e42f245ff4d9b4ca8f8c7146e Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Fri, 21 Sep 2007 19:32:19 +0200 Subject: Create.c s/major/major_num/ don't shadow the major() function by int major. Signed-off-by: maximilian attems Signed-off-by: Neil Brown --- Create.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Create.c') diff --git a/Create.c b/Create.c index 3e6f1af..31b63b4 100644 --- a/Create.c +++ b/Create.c @@ -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); -- cgit