提交 84dd97a6 编写于 作者: N NeilBrown 提交者: Shaohua Li

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

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: NNeilBrown <neilb@suse.com>
Signed-off-by: NShaohua Li <shli@fb.com>
上级 37011e3a
...@@ -7532,9 +7532,12 @@ static int raid5_remove_disk(struct mddev *mddev, struct md_rdev *rdev) ...@@ -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 * we can't wait pending write here, as this is called in
* raid5d, wait will deadlock. * 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; return -EBUSY;
}
log_exit(conf); log_exit(conf);
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册