diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
| commit | 76467874b83835129dc454e3a7a8e5d1186101b0 (patch) | |
| tree | 162129f0c36c35be4aa323cf00626db0e804c3fc /drivers/md/raid10.c | |
| parent | 8628de0583504138551a05ad44ca388467f0f552 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/md/raid10.c')
| -rw-r--r-- | drivers/md/raid10.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index ab90a6d12020..617012bc107a 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -1117,8 +1117,7 @@ static int end_sync_read(struct bio *bio, unsigned int bytes_done, int error) | |||
| 1117 | for (i=0; i<conf->copies; i++) | 1117 | for (i=0; i<conf->copies; i++) |
| 1118 | if (r10_bio->devs[i].bio == bio) | 1118 | if (r10_bio->devs[i].bio == bio) |
| 1119 | break; | 1119 | break; |
| 1120 | if (i == conf->copies) | 1120 | BUG_ON(i == conf->copies); |
| 1121 | BUG(); | ||
| 1122 | update_head_pos(i, r10_bio); | 1121 | update_head_pos(i, r10_bio); |
| 1123 | d = r10_bio->devs[i].devnum; | 1122 | d = r10_bio->devs[i].devnum; |
| 1124 | 1123 | ||
| @@ -1518,8 +1517,7 @@ static int init_resync(conf_t *conf) | |||
| 1518 | int buffs; | 1517 | int buffs; |
| 1519 | 1518 | ||
| 1520 | buffs = RESYNC_WINDOW / RESYNC_BLOCK_SIZE; | 1519 | buffs = RESYNC_WINDOW / RESYNC_BLOCK_SIZE; |
| 1521 | if (conf->r10buf_pool) | 1520 | BUG_ON(conf->r10buf_pool); |
| 1522 | BUG(); | ||
| 1523 | conf->r10buf_pool = mempool_create(buffs, r10buf_pool_alloc, r10buf_pool_free, conf); | 1521 | conf->r10buf_pool = mempool_create(buffs, r10buf_pool_alloc, r10buf_pool_free, conf); |
| 1524 | if (!conf->r10buf_pool) | 1522 | if (!conf->r10buf_pool) |
| 1525 | return -ENOMEM; | 1523 | return -ENOMEM; |