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

Commit 7a488377 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.15/core' of git://git.kernel.dk/linux-block 

Pull core block layer updates from Jens Axboe:
 "This is the pull request for the core block IO bits for the 3.15
  kernel.  It's a smaller round this time, it contains:

   - Various little blk-mq fixes and additions from Christoph and
     myself.

   - Cleanup of the IPI usage from the block layer, and associated
     helper code.  From Frederic Weisbecker and Jan Kara.

   - Duplicate code cleanup in bio-integrity from Gu Zheng.  This will
     give you a merge conflict, but that should be easy to resolve.

   - blk-mq notify spinlock fix for RT from Mike Galbraith.

   - A blktrace partial accounting bug fix from Roman Pen.

   - Missing REQ_SYNC detection fix for blk-mq from Shaohua Li"

* 'for-3.15/core' of git://git.kernel.dk/linux-block: (25 commits)
  blk-mq: add REQ_SYNC early
  rt,blk,mq: Make blk_mq_cpu_notify_lock a raw spinlock
  blk-mq: support partial I/O completions
  blk-mq: merge blk_mq_insert_request and blk_mq_run_request
  blk-mq: remove blk_mq_alloc_rq
  blk-mq: don't dump CPU -> hw queue map on driver load
  blk-mq: fix wrong usage of hctx->state vs hctx->flags
  blk-mq: allow blk_mq_init_commands() to return failure
  block: remove old blk_iopoll_enabled variable
  blktrace: fix accounting of partially completed requests
  smp: Rename __smp_call_function_single() to smp_call_function_single_async()
  smp: Remove wait argument from __smp_call_function_single()
  watchdog: Simplify a little the IPI call
  smp: Move __smp_call_function_single() below its safe version
  smp: Consolidate the various smp_call_function_single() declensions
  smp: Teach __smp_call_function_single() to check for offline cpus
  smp: Remove unused list_head from csd
  smp: Iterate functions through llist_for_each_entry_safe()
  block: Stop abusing rq->csd.list in blk-softirq
  block: Remove useless IPI struct initialization
  ...
parents 1a0b6aba 27fbf4e8

block/blk-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static void blkg_destroy(struct blkcg_gq *blkg) 
	 * under queue_lock.  If it's not pointing to @blkg now, it never

	 * will.  Hint assignment itself can race safely.

	 */

	if (rcu_dereference_raw(blkcg->blkg_hint) == blkg)

	if (rcu_access_pointer(blkcg->blkg_hint) == blkg)

		rcu_assign_pointer(blkcg->blkg_hint, NULL);



	/*

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2353,7 +2353,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) 
	if (!req->bio)

		return false;



	trace_block_rq_complete(req->q, req);

	trace_block_rq_complete(req->q, req, nr_bytes);



	/*

	 * For fs requests, rq is just carrier of independent bio's

block/blk-ioc.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static void ioc_destroy_icq(struct io_cq *icq) 
	 * under queue_lock.  If it's not pointing to @icq now, it never

	 * will.  Hint assignment itself can race safely.

	 */

	if (rcu_dereference_raw(ioc->icq_hint) == icq)

	if (rcu_access_pointer(ioc->icq_hint) == icq)

		rcu_assign_pointer(ioc->icq_hint, NULL);



	ioc_exit_icq(icq);

block/blk-iopoll.c

+0 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 


#include "blk.h"



int blk_iopoll_enabled = 1;

EXPORT_SYMBOL(blk_iopoll_enabled);



static unsigned int blk_iopoll_budget __read_mostly = 256;



static DEFINE_PER_CPU(struct list_head, blk_cpu_iopoll);

block/blk-mq-cpumap.c

+0 −10
Original line number Diff line number Diff line
@@ -9,15 +9,6 @@ 
#include "blk.h"

#include "blk-mq.h"



static void show_map(unsigned int *map, unsigned int nr)

{

	int i;



	pr_info("blk-mq: CPU -> queue map\n");

	for_each_online_cpu(i)

		pr_info("  CPU%2u -> Queue %u\n", i, map[i]);

}



static int cpu_to_queue_index(unsigned int nr_cpus, unsigned int nr_queues,

			      const int cpu)

{
@@ -85,7 +76,6 @@ int blk_mq_update_queue_map(unsigned int *map, unsigned int nr_queues) 
			map[i] = map[first_sibling];

	}



	show_map(map, nr_cpus);

	free_cpumask_var(cpus);

	return 0;

}