block: reduce part_stat_lock() scope (524f9ffd) · Commits · 戴 / test

block/blk-core.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1437,9 +1437,9 @@ void blk_account_io_done(struct request *req, u64 now)
		update_io_ticks(part, jiffies, true);
		part_stat_inc(part, ios[sgrp]);
		part_stat_add(part, nsecs[sgrp], now - req->start_time_ns);
		part_stat_unlock();

		hd_struct_put(part);
		part_stat_unlock();
		}
		}

		@@ -1448,8 +1448,9 @@ void blk_account_io_start(struct request *rq)
		if (!blk_do_io_stat(rq))
		return;

		part_stat_lock();
		rq->part = disk_map_sector_rcu(rq->rq_disk, blk_rq_pos(rq));

		part_stat_lock();
		update_io_ticks(rq->part, jiffies, false);
		part_stat_unlock();
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -674,8 +674,9 @@ static void blk_account_io_merge_request(struct request *req)
		if (blk_do_io_stat(req)) {
		part_stat_lock();
		part_stat_inc(req->part, merges[op_stat_group(req_op(req))]);
		hd_struct_put(req->part);
		part_stat_unlock();

		hd_struct_put(req->part);
		}
		}