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

Commit e9ccb945 authored by Mike Snitzer's avatar Mike Snitzer
Browse files

Merge remote-tracking branch 'jens/for-4.8/core' into dm-4.8 

DM's DAX support depends on block core's newly added QUEUE_FLAG_DAX.
parents 2a0fbffb 72ef799b

Documentation/block/queue-sysfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ disk. 


logical_block_size (RO)

-----------------------

This is the logcal block size of the device, in bytes.

This is the logical block size of the device, in bytes.



max_hw_sectors_kb (RO)

----------------------

block/bio-integrity.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/bio.h>

#include <linux/workqueue.h>

#include <linux/slab.h>

#include "blk.h"



#define BIP_INLINE_VECS	4

block/blk-cgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ static int blkcg_print_stat(struct seq_file *sf, void *v) 
	return 0;

}



struct cftype blkcg_files[] = {

static struct cftype blkcg_files[] = {

	{

		.name = "stat",

		.flags = CFTYPE_NOT_ON_ROOT,
@@ -914,7 +914,7 @@ struct cftype blkcg_files[] = { 
	{ }	/* terminate */

};



struct cftype blkcg_legacy_files[] = {

static struct cftype blkcg_legacy_files[] = {

	{

		.name = "reset_stats",

		.write_u64 = blkcg_reset_stats,

block/blk-exec.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, 


	/*

	 * don't check dying flag for MQ because the request won't

	 * be resued after dying flag is set

	 * be reused after dying flag is set

	 */

	if (q->mq_ops) {

		blk_mq_insert_request(rq, at_head, true, false);

block/blk-merge.c

+6 −0
Original line number Diff line number Diff line
@@ -744,6 +744,12 @@ int attempt_front_merge(struct request_queue *q, struct request *rq) 
int blk_attempt_req_merge(struct request_queue *q, struct request *rq,

			  struct request *next)

{

	struct elevator_queue *e = q->elevator;



	if (e->type->ops.elevator_allow_rq_merge_fn)

		if (!e->type->ops.elevator_allow_rq_merge_fn(q, rq, next))

			return 0;



	return attempt_merge(q, rq, next);

}