diff options
| author | Neil Brown <neilb@cse.unsw.edu.au> | 2002-06-18 04:16:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-18 04:16:00 -0700 |
| commit | 26d2d54293dc020c5ab42a3f804fea2590c79780 (patch) | |
| tree | 41df37ffecf20f375262be40053889e326d9fde0 /drivers | |
| parent | d68884874e806edd0aba98dce3559f1a6f19c3cb (diff) | |
[PATCH] md 6 of 22 - Discard "param" from mddev structure
It isn't needed. Only the chunksize is used, and it
can be found in the superblock.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/linear.c | 2 | ||||
| -rw-r--r-- | drivers/md/md.c | 10 | ||||
| -rw-r--r-- | drivers/md/raid0.c | 4 |
3 files changed, 3 insertions, 13 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index 118ce821a208..90a5fe2047ed 100644 --- a/drivers/md/linear.c +++ b/drivers/md/linear.c @@ -186,7 +186,7 @@ static int linear_status (char *page, mddev_t *mddev) } 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; } diff --git a/drivers/md/md.c b/drivers/md/md.c index d274d97beaf7..e60dc0d18641 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -1626,9 +1626,6 @@ static int do_md_run(mddev_t * mddev) 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 @@ static int md_ioctl(struct inode *inode, struct file *file, 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 diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index 430448c566af..641b3fef9e10 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -233,7 +233,7 @@ static int raid0_make_request (mddev_t *mddev, int rw, struct bio *bio) 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 @@ static int raid0_status (char *page, mddev_t *mddev) 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; } |