]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Create.c s/major/major_num/
authormaximilian attems <max@stro.at>
Fri, 21 Sep 2007 17:32:19 +0000 (19:32 +0200)
committerNeil Brown <neilb@suse.de>
Mon, 24 Sep 2007 03:21:38 +0000 (13:21 +1000)
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>
Create.c

index 3e6f1af8799da56d287d6f6ee3525074e79aed61..31b63b446d394a2d6b2897b9dabe1084f2d45015 100644 (file)
--- 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);