joel16/android_kernel_sony_msm8994
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994.git synced 2024-11-23 12:10:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block: row: Fix crash when adding a new field in bio struct

Browse Source 
When adding new field to struct bio there is a crash in the removed
code lines. This issue was introduced by commit
80a8f0f87b  "block: row-iosched idling
triggered by readahead pages"

(Partly) reverting this patch till root cause is fixed (on FS level).

Change-Id: Idce180802227aaab495bf0723768ba4cb437bcab
Signed-off-by: Tanya Brokhman <tlinder@codeaurora.org>
This commit is contained in:
Tanya Brokhman 2014-06-22 16:18:04 +03:00
parent 3a1d2bde49
commit 01635f0715
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/row-iosched.c
View File

@ -1,7 +1,7 @@
/*
* ROW (Read Over Write) I/O scheduler.
*
* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -331,10 +331,6 @@ static void row_add_request(struct request_queue *q,
struct row_queue *rqueue = RQ_ROWQ(rq);
s64 diff_ms;
bool queue_was_empty = list_empty(&rqueue->fifo);
unsigned long bv_page_flags = 0;
if (rq->bio && rq->bio->bi_io_vec && rq->bio->bi_io_vec->bv_page)
bv_page_flags = rq->bio->bi_io_vec->bv_page->flags;
list_add_tail(&rq->queuelist, &rqueue->fifo);
rd->nr_reqs[rq_data_dir(rq)]++;
@ -367,9 +363,7 @@ static void row_add_request(struct request_queue *q,
rqueue->idle_data.begin_idling = false;
return;
}
if ((bv_page_flags & (1L << PG_readahead)) ||
(diff_ms < rd->rd_idle_data.freq_ms)) {
if (diff_ms < rd->rd_idle_data.freq_ms) {
rqueue->idle_data.begin_idling = true;
row_log_rowq(rd, rqueue->prio, "Enable idling");
} else {