Merge branch 'for-3.19/core' into for-3.19/drivers (f74cd637) · Commits · e / devices / android_kernel_fairphone_FP4

block/bio.c

+28 −0

Original line number	Diff line number	Diff line
		@@ -1739,6 +1739,34 @@ void bio_check_pages_dirty(struct bio *bio)
		}
		}

		void generic_start_io_acct(int rw, unsigned long sectors,
		struct hd_struct *part)
		{
		int cpu = part_stat_lock();

		part_round_stats(cpu, part);
		part_stat_inc(cpu, part, ios[rw]);
		part_stat_add(cpu, part, sectors[rw], sectors);
		part_inc_in_flight(part, rw);

		part_stat_unlock();
		}
		EXPORT_SYMBOL(generic_start_io_acct);

		void generic_end_io_acct(int rw, struct hd_struct *part,
		unsigned long start_time)
		{
		unsigned long duration = jiffies - start_time;
		int cpu = part_stat_lock();

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

		part_stat_unlock();
		}
		EXPORT_SYMBOL(generic_end_io_acct);

		#if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
		void bio_flush_dcache_pages(struct bio *bi)
		{

block/blk-mq.c

+10 −21

Original line number	Diff line number	Diff line
		@@ -798,10 +798,11 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)
		*/
		static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx)
		{
		int cpu = hctx->next_cpu;
		if (hctx->queue->nr_hw_queues == 1)
		return WORK_CPU_UNBOUND;

		if (--hctx->next_cpu_batch <= 0) {
		int next_cpu;
		int cpu = hctx->next_cpu, next_cpu;

		next_cpu = cpumask_next(hctx->next_cpu, hctx->cpumask);
		if (next_cpu >= nr_cpu_ids)
		@@ -809,11 +810,13 @@ static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx)

		hctx->next_cpu = next_cpu;
		hctx->next_cpu_batch = BLK_MQ_CPU_WORK_BATCH;
		}

		return cpu;
		}

		return hctx->next_cpu;
		}

		void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
		{
		if (unlikely(test_bit(BLK_MQ_S_STOPPED, &hctx->state)))
		@@ -830,14 +833,8 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
		put_cpu();
		}

		if (hctx->queue->nr_hw_queues == 1)
		kblockd_schedule_delayed_work(&hctx->run_work, 0);
		else {
		unsigned int cpu;

		cpu = blk_mq_hctx_next_cpu(hctx);
		kblockd_schedule_delayed_work_on(cpu, &hctx->run_work, 0);
		}
		kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx),
		&hctx->run_work, 0);
		}

		void blk_mq_run_queues(struct request_queue *q, bool async)
		@@ -929,16 +926,8 @@ static void blk_mq_delay_work_fn(struct work_struct *work)

		void blk_mq_delay_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs)
		{
		unsigned long tmo = msecs_to_jiffies(msecs);

		if (hctx->queue->nr_hw_queues == 1)
		kblockd_schedule_delayed_work(&hctx->delay_work, tmo);
		else {
		unsigned int cpu;

		cpu = blk_mq_hctx_next_cpu(hctx);
		kblockd_schedule_delayed_work_on(cpu, &hctx->delay_work, tmo);
		}
		kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx),
		&hctx->delay_work, msecs_to_jiffies(msecs));
		}
		EXPORT_SYMBOL(blk_mq_delay_queue);

block/genhd.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -1070,9 +1070,16 @@ int disk_expand_part_tbl(struct gendisk *disk, int partno)
		struct disk_part_tbl *old_ptbl = disk->part_tbl;
		struct disk_part_tbl *new_ptbl;
		int len = old_ptbl ? old_ptbl->len : 0;
		int target = partno + 1;
		int i, target;
		size_t size;
		int i;

		/*
		* check for int overflow, since we can get here from blkpg_ioctl()
		* with a user passed 'partno'.
		*/
		target = partno + 1;
		if (target < 0)
		return -EINVAL;

		/* disk_max_parts() is zero during initialization, ignore if so */
		if (disk_max_parts(disk) && target > disk_max_parts(disk))

include/linux/bio.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -443,6 +443,11 @@ extern struct bio bio_copy_kern(struct request_queue , void *, unsigned int,
		extern void bio_set_pages_dirty(struct bio *bio);
		extern void bio_check_pages_dirty(struct bio *bio);

		void generic_start_io_acct(int rw, unsigned long sectors,
		struct hd_struct *part);
		void generic_end_io_acct(int rw, struct hd_struct *part,
		unsigned long start_time);

		#ifndef ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
		# error "You should define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE for your platform"
		#endif