* PATCH - md 6 of 22 - Discard "param" from mddev structure
@ 2002-06-19 0:50 Neil Brown
0 siblings, 0 replies; only message in thread
From: Neil Brown @ 2002-06-19 0:50 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-raid
It isn't needed. Only the chunksize is used, and it
can be found in the superblock.
----------- Diffstat output ------------
./drivers/md/linear.c | 2 +-
./drivers/md/md.c | 10 ----------
./drivers/md/raid0.c | 4 ++--
./include/linux/raid/md_k.h | 1 -
4 files changed, 3 insertions(+), 14 deletions(-)
--- ./drivers/md/md.c 2002/06/18 03:33:36 1.5
+++ ./drivers/md/md.c 2002/06/18 03:34:17 1.6
@@ -1626,9 +1626,6 @@
chunk_size = mddev->sb->chunk_size;
pnum = level_to_pers(mddev->sb->level);
- mddev->param.chunk_size = chunk_size;
- mddev->param.personality = pnum;
-
if ((pnum != MULTIPATH) && (pnum != RAID1)) {
if (!chunk_size) {
/*
@@ -2828,13 +2825,6 @@
case RUN_ARRAY:
{
-/* The data is never used....
- mdu_param_t param;
- err = copy_from_user(¶m, (mdu_param_t *)arg,
- sizeof(param));
- if (err)
- goto abort_unlock;
-*/
err = do_md_run (mddev);
/*
* we have to clean up the mess if
--- ./drivers/md/linear.c 2002/06/18 03:33:55 1.1
+++ ./drivers/md/linear.c 2002/06/18 03:34:17 1.2
@@ -186,7 +186,7 @@
}
sz += sprintf(page+sz, "\n");
#endif
- sz += sprintf(page+sz, " %dk rounding", mddev->param.chunk_size/1024);
+ sz += sprintf(page+sz, " %dk rounding", mddev->sb->chunk_size/1024);
return sz;
}
--- ./drivers/md/raid0.c 2002/06/18 03:33:55 1.1
+++ ./drivers/md/raid0.c 2002/06/18 03:34:17 1.2
@@ -233,7 +233,7 @@
mdk_rdev_t *tmp_dev;
unsigned long chunk, block, rsect;
- chunk_size = mddev->param.chunk_size >> 10;
+ chunk_size = mddev->sb->chunk_size >> 10;
chunksize_bits = ffz(~chunk_size);
block = bio->bi_sector >> 1;
hash = conf->hash_table + block / conf->smallest->size;
@@ -322,7 +322,7 @@
conf->strip_zone[j].size);
}
#endif
- sz += sprintf(page + sz, " %dk chunks", mddev->param.chunk_size/1024);
+ sz += sprintf(page + sz, " %dk chunks", mddev->sb->chunk_size/1024);
return sz;
}
--- ./include/linux/raid/md_k.h 2002/06/18 03:26:36 1.2
+++ ./include/linux/raid/md_k.h 2002/06/18 03:34:18 1.3
@@ -199,7 +199,6 @@
int nb_dev;
struct list_head disks;
int sb_dirty;
- mdu_param_t param;
int ro;
unsigned long curr_resync; /* blocks scheduled */
unsigned long resync_mark; /* a recent timestamp */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2002-06-19 0:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-06-19 0:50 PATCH - md 6 of 22 - Discard "param" from mddev structure 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).