mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'android11-5.4' into 'android11-5.4-lts'
Sync up with android11-5.4 for the following commits:617c7432b5ANDROID: GKI: Enable CONFIG_SERIAL_8250_RUNTIME_UARTS=0813b12454eANDROID: GKI: db845c: Update symbols list and ABI15dd5a8bc0ANDROID: Increase x86 cmdline size to 4k4ec7ffac46UPSTREAM: cgroup-v1: Require capabilities to set release_agentfe0c18d0f0ANDROID: incremental-fs: remove index and incomplete dir on umount7aedba616cUPSTREAM: binder: fix async_free_space accounting for empty parcelsf1a1171f3cUPSTREAM: tee: handle lookup of shm with reference count 0693158f765UPSTREAM: bpf: Fix integer overflow in argument calculation for bpf_map_area_allocb9d179c605UPSTREAM: driver core: Fix possible memory leak in device_link_add()3aeff14796UPSTREAM: blk-mq: fix kernel panic during iterating over flush request54e1868c8bUPSTREAM: net: xfrm: fix memory leak in xfrm_user_rcv_msga4e84758f0UPSTREAM: binder: fix the missing BR_FROZEN_REPLY in binder_return_strings013b7ed754ANDROID: incremental-fs: fix mount_fs issueba4942c83dMerge tag 'android11-5.4.161_r00' into android11-5.4202bc8432cUPSTREAM: vfs: fs_context: fix up param length parsing in legacy_parse_param New symbols tracked due to them being added in the android11-5.4 branch: Leaf changes summary: 1 artifact changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 1 Added function: [A] 'function void kill_anon_super(super_block*)' Signed-off-by: Greg Kroah-Hartman <[email protected]> Change-Id: I89df6d21c7c36bb6b2a9047b1f7e2988f48a5637
This commit is contained in:
commit
82b6e1787f
12 changed files with 1291 additions and 1237 deletions
|
|
@ -120,7 +120,6 @@ void blk_rq_init(struct request_queue *q, struct request *rq)
|
|||
rq->internal_tag = -1;
|
||||
rq->start_time_ns = ktime_get_ns();
|
||||
rq->part = NULL;
|
||||
refcount_set(&rq->ref, 1);
|
||||
}
|
||||
EXPORT_SYMBOL(blk_rq_init);
|
||||
|
||||
|
|
|
|||
|
|
@ -325,6 +325,14 @@ static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq,
|
|||
flush_rq->rq_flags |= RQF_FLUSH_SEQ;
|
||||
flush_rq->rq_disk = first_rq->rq_disk;
|
||||
flush_rq->end_io = flush_end_io;
|
||||
/*
|
||||
* Order WRITE ->end_io and WRITE rq->ref, and its pair is the one
|
||||
* implied in refcount_inc_not_zero() called from
|
||||
* blk_mq_find_and_get_req(), which orders WRITE/READ flush_rq->ref
|
||||
* and READ flush_rq->end_io
|
||||
*/
|
||||
smp_wmb();
|
||||
refcount_set(&flush_rq->ref, 1);
|
||||
|
||||
blk_flush_queue_rq(flush_rq, false);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue