Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01635f07 authored by Tanya Brokhman's avatar Tanya Brokhman
Browse files

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



When adding new field to struct bio there is a crash in the removed
code lines. This issue was introduced by commit
80a8f0f8  "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: default avatarTanya Brokhman <tlinder@codeaurora.org>
parent 3a1d2bde

block/row-iosched.c

+2 −8
Original line number Diff line number Diff line 
/*

 * 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 {