FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-02 12:47:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

md/raid5: don't test ->writes_pending in raid5_remove_disk

Browse Source 
This test on ->writes_pending cannot be safe as the counter
can be incremented at any moment and cannot be locked against.

Change it to test conf->active_stripes, which at least
can be locked against.  More changes are still needed.

A future patch will change ->writes_pending, and testing it here will
be very inconvenient.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
This commit is contained in:
NeilBrown 2017-03-15 14:05:14 +11:00 committed by Shaohua Li
parent 37011e3afb
commit 84dd97a690
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/md/raid5.c
View File

@ -7532,9 +7532,12 @@ static int raid5_remove_disk(struct mddev *mddev, struct md_rdev *rdev)
/*
* we can't wait pending write here, as this is called in
* raid5d, wait will deadlock.
* neilb: there is no locking about new writes here,
* so this cannot be safe.
*/
if (atomic_read(&mddev->writes_pending))
if (atomic_read(&conf->active_stripes)) {
return -EBUSY;
}
log_exit(conf);
return 0;
}