diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2017-11-20 21:48:45 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-11-20 21:48:45 +0530 |
| commit | baa6b7f93aec81644160ca02a8a6a5ae3be4ce85 (patch) | |
| tree | 2a6bf027912ae74a354ce3b7d460d04ccfac4e55 /block/blk.h | |
| parent | 7bc703cde6592016ed3eadd8bd592ee9adbe6647 (diff) | |
| parent | f409333f361fed0c71c479b2a0c4e032d496cd94 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-18.03-androidlsk-v3.18-18.02-androidlsk-v3.18-17.11-androidlinux-linaro-lsk-v3.18-android
Conflicts:
net/packet/af_packet.c
Fix conflicts by refactoring changes from LTS commit
e4ffdf9ead59 ("packet: hold bind lock when rebinding to fanout hook"),
to align with the changes from AOSP commit 6bec212418d2
("UPSTREAM: packet: fix races in fanout_add()").
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/block/blk.h b/block/blk.h index 43b036185712..e01b5ee80fe7 100644 --- a/block/blk.h +++ b/block/blk.h @@ -22,6 +22,12 @@ struct blk_flush_queue { struct list_head flush_queue[2]; struct list_head flush_data_in_flight; struct request *flush_rq; + + /* + * flush_rq shares tag with this rq, both can't be active + * at the same time + */ + struct request *orig_rq; spinlock_t mq_flush_lock; }; |