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

Commit 72447d3f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "block: prevent access to NULL pointer in req->part""

parents 56db87cc 0730ae1d

block/blk-core.c

+3 −7
Original line number Diff line number Diff line
@@ -2099,11 +2099,8 @@ static void blk_account_io_completion(struct request *req, unsigned int bytes) 
		struct hd_struct *part;

		int cpu;



		part = req->part;

		if (!part)

			return;



		cpu = part_stat_lock();

		part = req->part;

		part_stat_add(cpu, part, sectors[rw], bytes >> 9);

		part_stat_unlock();

	}
@@ -2122,15 +2119,14 @@ static void blk_account_io_done(struct request *req) 
		struct hd_struct *part;

		int cpu;



		cpu = part_stat_lock();

		part = req->part;

		if (!req->part)

			return;



		cpu = part_stat_lock();

		part_stat_inc(cpu, part, ios[rw]);

		part_stat_add(cpu, part, ticks[rw], duration);

		part_round_stats(cpu, part);

		part_dec_in_flight(part, rw);



		hd_struct_put(part);

		part_stat_unlock();

	}