diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /drivers/md/raid1.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index a389394b52f6..83380b5d6593 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
| @@ -797,7 +797,7 @@ static int raid1_remove_disk(mddev_t *mddev, int number) | |||
| 797 | goto abort; | 797 | goto abort; |
| 798 | } | 798 | } |
| 799 | p->rdev = NULL; | 799 | p->rdev = NULL; |
| 800 | synchronize_kernel(); | 800 | synchronize_rcu(); |
| 801 | if (atomic_read(&rdev->nr_pending)) { | 801 | if (atomic_read(&rdev->nr_pending)) { |
| 802 | /* lost the race, try later */ | 802 | /* lost the race, try later */ |
| 803 | err = -EBUSY; | 803 | err = -EBUSY; |