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

Commit 10c93760 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-2.6.38/core' into for-next

parents f3c1e66f e61eb2e9

block/cfq-iosched.c

+0 −6
Original line number Diff line number Diff line
@@ -2103,12 +2103,6 @@ static void choose_service_tree(struct cfq_data *cfqd, struct cfq_group *cfqg) 
	unsigned group_slice;

	enum wl_prio_t original_prio = cfqd->serving_prio;



	if (!cfqg) {

		cfqd->serving_prio = IDLE_WORKLOAD;

		cfqd->workload_expires = jiffies + 1;

		return;

	}



	/* Choose next priority. RT > BE > IDLE */

	if (cfq_group_busy_queues_wl(RT_WORKLOAD, cfqd, cfqg))

		cfqd->serving_prio = RT_WORKLOAD;

block/genhd.c

+2 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static struct blk_major_name { 
} *major_names[BLKDEV_MAJOR_HASH_SIZE];



/* index in the above - for now: assume no multimajor ranges */

static inline int major_to_index(int major)

static inline int major_to_index(unsigned major)

{

	return major % BLKDEV_MAJOR_HASH_SIZE;

}
@@ -828,7 +828,7 @@ static void *show_partition_start(struct seq_file *seqf, loff_t *pos) 
	static void *p;



	p = disk_seqf_start(seqf, pos);

	if (!IS_ERR(p) && p && !*pos)

	if (!IS_ERR_OR_NULL(p) && !*pos)

		seq_puts(seqf, "major minor  #blocks  name\n\n");

	return p;

}

drivers/block/loop.c

+0 −4
Original line number Diff line number Diff line
@@ -397,10 +397,6 @@ lo_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf, 
	sector_t IV;

	int size, ret;



	ret = buf->ops->confirm(pipe, buf);

	if (unlikely(ret))

		return ret;



	IV = ((sector_t) page->index << (PAGE_CACHE_SHIFT - 9)) +

							(buf->offset >> 9);

	size = sd->len;

fs/char_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static struct char_device_struct { 
} *chrdevs[CHRDEV_MAJOR_HASH_SIZE];



/* index in the above */

static inline int major_to_index(int major)

static inline int major_to_index(unsigned major)

{

	return major % CHRDEV_MAJOR_HASH_SIZE;

}

fs/nfsd/vfs.c

+0 −4
Original line number Diff line number Diff line
@@ -847,10 +847,6 @@ nfsd_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf, 
	size_t size;

	int ret;



	ret = buf->ops->confirm(pipe, buf);

	if (unlikely(ret))

		return ret;



	size = sd->len;



	if (rqstp->rq_res.page_len == 0) {