diff options
| author | Shaohua Li <shli@fb.com> | 2017-05-01 14:09:21 -0700 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2017-05-01 14:09:21 -0700 |
| commit | e265eb3a30543a237b2ebc4e0422ac82e55b07e4 (patch) | |
| tree | 5485bce4a0645e5e9b6ef4686bd390b7b2599ffb /drivers/md/raid1.h | |
| parent | 85724edecbdc19f53ed4b902fc3a32e4d1b61c9b (diff) | |
| parent | b506335e5d2b4ec687dde392a3bdbf7601778f1d (diff) | |
| download | op-kernel-dev-e265eb3a30543a237b2ebc4e0422ac82e55b07e4.zip op-kernel-dev-e265eb3a30543a237b2ebc4e0422ac82e55b07e4.tar.gz | |
Merge branch 'md-next' into md-linus
Diffstat (limited to 'drivers/md/raid1.h')
| -rw-r--r-- | drivers/md/raid1.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/md/raid1.h b/drivers/md/raid1.h index dd22a37..c8894ef 100644 --- a/drivers/md/raid1.h +++ b/drivers/md/raid1.h @@ -84,6 +84,7 @@ struct r1conf { */ wait_queue_head_t wait_barrier; spinlock_t resync_lock; + atomic_t nr_sync_pending; atomic_t *nr_pending; atomic_t *nr_waiting; atomic_t *nr_queued; @@ -107,6 +108,8 @@ struct r1conf { mempool_t *r1bio_pool; mempool_t *r1buf_pool; + struct bio_set *bio_split; + /* temporary buffer to synchronous IO when attempting to repair * a read error. */ @@ -153,9 +156,13 @@ struct r1bio { int read_disk; struct list_head retry_list; - /* Next two are only valid when R1BIO_BehindIO is set */ - struct bio_vec *behind_bvecs; - int behind_page_count; + + /* + * When R1BIO_BehindIO is set, we store pages for write behind + * in behind_master_bio. + */ + struct bio *behind_master_bio; + /* * if the IO is in WRITE direction, then multiple bios are used. * We choose the number when they are allocated. |
