evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] md: minor MD fixes

Browse source 
1/ Use reduce stack usage, because 'gcc' apparently doesn't overlay
   different variables  that are in separate scopes...

2/ Use test_bit instead of ( .. & 1<< ..) which in this case is buggy.

Thanks to Andrew Morton

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
NeilBrown 2005-11-08 21:39:29 -08:00 • committed by Linus Torvalds
parent 9c79197761
commit 31399d9e56
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/md/md.c
View file

@ -698,6 +698,7 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev)
struct list_head *tmp; struct list_head *tmp;
mdk_rdev_t *rdev2; mdk_rdev_t *rdev2;
int next_spare = mddev->raid_disks; int next_spare = mddev->raid_disks;
char nm[20];
/* make rdev->sb match mddev data.. /* make rdev->sb match mddev data..
* *
@ -768,7 +769,6 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev)
fixdesc |= (1 << desc_nr); fixdesc |= (1 << desc_nr);
rdev2->desc_nr = desc_nr; rdev2->desc_nr = desc_nr;
if (rdev2->raid_disk >= 0) { if (rdev2->raid_disk >= 0) {
char nm[20];
sprintf(nm, "rd%d", rdev2->raid_disk); sprintf(nm, "rd%d", rdev2->raid_disk);
sysfs_remove_link(&mddev->kobj, nm); sysfs_remove_link(&mddev->kobj, nm);
} }
@ -814,7 +814,6 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev)
&rdev2->bdev->bd_disk->kobj, &rdev2->bdev->bd_disk->kobj,
"block"); "block");
if (rdev2->raid_disk >= 0) { if (rdev2->raid_disk >= 0) {
char nm[20];
sprintf(nm, "rd%d", rdev2->raid_disk); sprintf(nm, "rd%d", rdev2->raid_disk);
sysfs_create_link(&mddev->kobj, sysfs_create_link(&mddev->kobj,
&rdev2->kobj, nm); &rdev2->kobj, nm);
@ -1722,9 +1721,9 @@ static ssize_t
md_show_scan(mddev_t *mddev, char *page) md_show_scan(mddev_t *mddev, char *page)
{ {
char *type = "none"; char *type = "none";
if (mddev->recovery & if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) ||
((1<<MD_RECOVERY_RUNNING) || (1<<MD_RECOVERY_NEEDED))) { test_bit(MD_RECOVERY_NEEDED, &mddev->recovery)) {
if (mddev->recovery & (1<<MD_RECOVERY_SYNC)) { if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
if (!test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) if (!test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))
type = "resync"; type = "resync";
else if (test_bit(MD_RECOVERY_CHECK, &mddev->recovery)) else if (test_bit(MD_RECOVERY_CHECK, &mddev->recovery))
@ -1741,8 +1740,9 @@ static ssize_t
md_store_scan(mddev_t *mddev, const char *page, size_t len) md_store_scan(mddev_t *mddev, const char *page, size_t len)
{ {
int canscan=0; int canscan=0;
if (mddev->recovery &
((1<<MD_RECOVERY_RUNNING) || (1<<MD_RECOVERY_NEEDED))) if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) ||
test_bit(MD_RECOVERY_NEEDED, &mddev->recovery))
return -EBUSY; return -EBUSY;
down(&mddev->reconfig_sem); down(&mddev->reconfig_sem);
if (mddev->pers && mddev->pers->sync_request) if (mddev->pers && mddev->pers->sync_request)