* [PATCH] mdadm: allow build to use --size
@ 2009-02-11 18:49 Paul Clements
2009-04-21 5:38 ` Neil Brown
0 siblings, 1 reply; 2+ messages in thread
From: Paul Clements @ 2009-02-11 18:49 UTC (permalink / raw)
To: linux-raid
[-- Attachment #1: Type: text/plain, Size: 535 bytes --]
This patch enables the --size parameter for build operations.
Without this, if you have a raid1, for instance, where the 2 disks are
not the exact same size, and you need to build the array but one of the
disks is not available right at the moment (maybe it's USB and it's
unplugged, or maybe it's a network disk and it's unavailable), then you
have to play some weird games to get the array to size correctly (that
is, to the size of the smaller of the two components or less).
There may be other uses for this too...
--
Paul
[-- Attachment #2: mdadm-build-size.diff --]
[-- Type: text/x-diff, Size: 3331 bytes --]
diff --exclude-from=/export/public/clemep/tmp/dontdiff -purN mdadm-2.5.1/Build.c mdadm-2.5.1-patched/Build.c
--- mdadm-2.5.1/Build.c 2006-05-19 01:21:44.000000000 -0400
+++ mdadm-2.5.1-patched/Build.c 2009-02-09 16:25:52.000000000 -0500
@@ -36,7 +36,8 @@
int Build(char *mddev, int mdfd, int chunk, int level, int layout,
int raiddisks,
mddev_dev_t devlist, int assume_clean,
- char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int verbose)
+ char *bitmap_file, int bitmap_chunk, int write_behind, int delay,
+ int verbose, unsigned long long size)
{
/* Build a linear or raid0 arrays without superblocks
* We cannot really do any checks, we just do it.
@@ -57,7 +58,6 @@ int Build(char *mddev, int mdfd, int chu
int subdevs = 0, missing_disks = 0;
mddev_dev_t dv;
int bitmap_fd;
- unsigned long long size = ~0ULL;
unsigned long long bitmapsize;
/* scan all devices, make sure they really are block devices */
@@ -119,7 +119,7 @@ int Build(char *mddev, int mdfd, int chu
if (vers >= 9000) {
mdu_array_info_t array;
array.level = level;
- array.size = 0;
+ array.size = size;
array.nr_disks = raiddisks;
array.raid_disks = raiddisks;
array.md_minor = 0;
@@ -171,11 +171,11 @@ int Build(char *mddev, int mdfd, int chu
if (ioctl(fd, BLKGETSIZE, &dsize) == 0 && dsize > 0) {
unsigned long long ldsize = dsize;
ldsize <<= 9;
- if (size== 0 || ldsize < size)
+ if (size == 0 || ldsize < size)
size = ldsize;
}
close(fd);
- if (vers>= 9000) {
+ if (vers >= 9000) {
mdu_disk_info_t disk;
disk.number = i;
disk.raid_disk = i;
Binary files mdadm-2.5.1/mdadm and mdadm-2.5.1-patched/mdadm differ
diff --exclude-from=/export/public/clemep/tmp/dontdiff -purN mdadm-2.5.1/mdadm.c mdadm-2.5.1-patched/mdadm.c
--- mdadm-2.5.1/mdadm.c 2006-06-02 01:51:01.000000000 -0400
+++ mdadm-2.5.1-patched/mdadm.c 2009-02-09 16:24:48.000000000 -0500
@@ -344,7 +344,8 @@ int main(int argc, char *argv[])
continue;
case O(GROW,'z'):
- case O(CREATE,'z'): /* size */
+ case O(CREATE,'z'):
+ case O(BUILD,'z'): /* size */
if (size >= 0) {
fprintf(stderr, Name ": size may only be specified once. "
"Second value is %s.\n", optarg);
@@ -1095,7 +1096,8 @@ int main(int argc, char *argv[])
}
rv = Build(devlist->devname, mdfd, chunk, level, layout,
raiddisks, devlist->next, assume_clean,
- bitmap_file, bitmap_chunk, write_behind, delay, verbose-quiet);
+ bitmap_file, bitmap_chunk, write_behind, delay,
+ verbose-quiet, size);
break;
case CREATE:
if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
diff --exclude-from=/export/public/clemep/tmp/dontdiff -purN mdadm-2.5.1/mdadm.h mdadm-2.5.1-patched/mdadm.h
--- mdadm-2.5.1/mdadm.h 2006-06-02 01:35:22.000000000 -0400
+++ mdadm-2.5.1-patched/mdadm.h 2009-02-09 16:26:18.000000000 -0500
@@ -382,7 +382,8 @@ extern int Assemble(struct supertype *st
extern int Build(char *mddev, int mdfd, int chunk, int level, int layout,
int raiddisks,
mddev_dev_t devlist, int assume_clean,
- char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int verbose);
+ char *bitmap_file, int bitmap_chunk, int write_behind,
+ int delay, int verbose, unsigned long long size);
extern int Create(struct supertype *st, char *mddev, int mdfd,
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] mdadm: allow build to use --size
2009-02-11 18:49 [PATCH] mdadm: allow build to use --size Paul Clements
@ 2009-04-21 5:38 ` Neil Brown
0 siblings, 0 replies; 2+ messages in thread
From: Neil Brown @ 2009-04-21 5:38 UTC (permalink / raw)
To: Paul Clements; +Cc: linux-raid
On Wednesday February 11, paul.clements@steeleye.com wrote:
> This patch enables the --size parameter for build operations.
>
> Without this, if you have a raid1, for instance, where the 2 disks are
> not the exact same size, and you need to build the array but one of the
> disks is not available right at the moment (maybe it's USB and it's
> unplugged, or maybe it's a network disk and it's unavailable), then you
> have to play some weird games to get the array to size correctly (that
> is, to the size of the smaller of the two components or less).
>
> There may be other uses for this too...
Cleaning up some old mail I found this.... sorry I didn't deal with
it at the time.
I've applied this patch to my 2.x branch and will pull it across to
3.x and some stage.
Is there somewhere in the man page that needs to know about this?
Thanks,
NeilBrown
>
> --
> Paul
> diff --exclude-from=/export/public/clemep/tmp/dontdiff -purN mdadm-2.5.1/Build.c mdadm-2.5.1-patched/Build.c
> --- mdadm-2.5.1/Build.c 2006-05-19 01:21:44.000000000 -0400
> +++ mdadm-2.5.1-patched/Build.c 2009-02-09 16:25:52.000000000 -0500
> @@ -36,7 +36,8 @@
> int Build(char *mddev, int mdfd, int chunk, int level, int layout,
> int raiddisks,
> mddev_dev_t devlist, int assume_clean,
> - char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int verbose)
> + char *bitmap_file, int bitmap_chunk, int write_behind, int delay,
> + int verbose, unsigned long long size)
> {
> /* Build a linear or raid0 arrays without superblocks
> * We cannot really do any checks, we just do it.
> @@ -57,7 +58,6 @@ int Build(char *mddev, int mdfd, int chu
> int subdevs = 0, missing_disks = 0;
> mddev_dev_t dv;
> int bitmap_fd;
> - unsigned long long size = ~0ULL;
> unsigned long long bitmapsize;
>
> /* scan all devices, make sure they really are block devices */
> @@ -119,7 +119,7 @@ int Build(char *mddev, int mdfd, int chu
> if (vers >= 9000) {
> mdu_array_info_t array;
> array.level = level;
> - array.size = 0;
> + array.size = size;
> array.nr_disks = raiddisks;
> array.raid_disks = raiddisks;
> array.md_minor = 0;
> @@ -171,11 +171,11 @@ int Build(char *mddev, int mdfd, int chu
> if (ioctl(fd, BLKGETSIZE, &dsize) == 0 && dsize > 0) {
> unsigned long long ldsize = dsize;
> ldsize <<= 9;
> - if (size== 0 || ldsize < size)
> + if (size == 0 || ldsize < size)
> size = ldsize;
> }
> close(fd);
> - if (vers>= 9000) {
> + if (vers >= 9000) {
> mdu_disk_info_t disk;
> disk.number = i;
> disk.raid_disk = i;
> Binary files mdadm-2.5.1/mdadm and mdadm-2.5.1-patched/mdadm differ
> diff --exclude-from=/export/public/clemep/tmp/dontdiff -purN mdadm-2.5.1/mdadm.c mdadm-2.5.1-patched/mdadm.c
> --- mdadm-2.5.1/mdadm.c 2006-06-02 01:51:01.000000000 -0400
> +++ mdadm-2.5.1-patched/mdadm.c 2009-02-09 16:24:48.000000000 -0500
> @@ -344,7 +344,8 @@ int main(int argc, char *argv[])
> continue;
>
> case O(GROW,'z'):
> - case O(CREATE,'z'): /* size */
> + case O(CREATE,'z'):
> + case O(BUILD,'z'): /* size */
> if (size >= 0) {
> fprintf(stderr, Name ": size may only be specified once. "
> "Second value is %s.\n", optarg);
> @@ -1095,7 +1096,8 @@ int main(int argc, char *argv[])
> }
> rv = Build(devlist->devname, mdfd, chunk, level, layout,
> raiddisks, devlist->next, assume_clean,
> - bitmap_file, bitmap_chunk, write_behind, delay, verbose-quiet);
> + bitmap_file, bitmap_chunk, write_behind, delay,
> + verbose-quiet, size);
> break;
> case CREATE:
> if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
> diff --exclude-from=/export/public/clemep/tmp/dontdiff -purN mdadm-2.5.1/mdadm.h mdadm-2.5.1-patched/mdadm.h
> --- mdadm-2.5.1/mdadm.h 2006-06-02 01:35:22.000000000 -0400
> +++ mdadm-2.5.1-patched/mdadm.h 2009-02-09 16:26:18.000000000 -0500
> @@ -382,7 +382,8 @@ extern int Assemble(struct supertype *st
> extern int Build(char *mddev, int mdfd, int chunk, int level, int layout,
> int raiddisks,
> mddev_dev_t devlist, int assume_clean,
> - char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int verbose);
> + char *bitmap_file, int bitmap_chunk, int write_behind,
> + int delay, int verbose, unsigned long long size);
>
>
> extern int Create(struct supertype *st, char *mddev, int mdfd,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-04-21 5:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-11 18:49 [PATCH] mdadm: allow build to use --size Paul Clements
2009-04-21 5:38 ` Neil Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).