xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "blktrace: Trace remapped requests correctly"

Browse Source 
This reverts commit 1ed71e6bce which is
commit 22c80aac882f712897b88b7ea8f5a74ea19019df upstream.

It breaks the Android GKI kernel abi, and is not needed for Android
devices, so revert it for now.  If it is needed for this branch, it can
come back later in an ABI-stable way.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I75de120370233d680e33d91d21ed55c2396ed2d0
This commit is contained in:
Greg Kroah-Hartman
2022-08-30 12:44:34 +02:00
parent eb5eb075d8
commit 33d6fea819
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trace/blktrace.c
View File

@@ -1100,7 +1100,7 @@ static void blk_add_trace_rq_remap(void *ignore, struct request *rq, dev_t dev,
r.sector_from = cpu_to_be64(from); r.sector_from = cpu_to_be64(from);
__blk_add_trace(bt, blk_rq_pos(rq), blk_rq_bytes(rq), __blk_add_trace(bt, blk_rq_pos(rq), blk_rq_bytes(rq),
req_op(rq), rq->cmd_flags, BLK_TA_REMAP, 0, rq_data_dir(rq), 0, BLK_TA_REMAP, 0,
sizeof(r), &r, blk_trace_request_get_cgid(rq)); sizeof(r), &r, blk_trace_request_get_cgid(rq));
rcu_read_unlock(); rcu_read_unlock();
} }