Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block (e0ab0bb6) · Commits · 戴 / test

block/elevator.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -964,17 +964,18 @@ void elv_unregister_queue(struct request_queue *q)

		int elv_register(struct elevator_type *e)
		{
		char *def = "";
		spin_lock_irq(&elv_list_lock);
		BUG_ON(elevator_find(e->elevator_name));
		list_add_tail(&e->list, &elv_list);
		spin_unlock_irq(&elv_list_lock);

		printk(KERN_INFO "io scheduler %s registered", e->elevator_name);
		if (!strcmp(e->elevator_name, chosen_elevator) \|\|
		(!*chosen_elevator &&
		!strcmp(e->elevator_name, CONFIG_DEFAULT_IOSCHED)))
		printk(" (default)");
		printk("\n");
		def = " (default)";

		printk(KERN_INFO "io scheduler %s registered%s\n", e->elevator_name, def);
		return 0;
		}
		EXPORT_SYMBOL_GPL(elv_register);

block/ll_rw_blk.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1221,7 +1221,7 @@ void blk_recount_segments(request_queue_t q, struct bio bio)
		* considered part of another segment, since that might
		* change with the bounce page.
		*/
		high = page_to_pfn(bv->bv_page) >= q->bounce_pfn;
		high = page_to_pfn(bv->bv_page) > q->bounce_pfn;
		if (high \|\| highprv)
		goto new_hw_segment;
		if (cluster) {
		@@ -3658,8 +3658,8 @@ int __init blk_dev_init(void)
		open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL);
		register_hotcpu_notifier(&blk_cpu_notifier);

		blk_max_low_pfn = max_low_pfn;
		blk_max_pfn = max_pfn;
		blk_max_low_pfn = max_low_pfn - 1;
		blk_max_pfn = max_pfn - 1;

		return 0;
		}

fs/splice.c

+15 −69

Original line number	Diff line number	Diff line
		@@ -576,30 +576,6 @@ static int pipe_to_file(struct pipe_inode_info pipe, struct pipe_buffer buf,
		if (this_len + offset > PAGE_CACHE_SIZE)
		this_len = PAGE_CACHE_SIZE - offset;

		/*
		* Reuse buf page, if SPLICE_F_MOVE is set and we are doing a full
		* page.
		*/
		if ((sd->flags & SPLICE_F_MOVE) && this_len == PAGE_CACHE_SIZE) {
		/*
		* If steal succeeds, buf->page is now pruned from the
		* pagecache and we can reuse it. The page will also be
		* locked on successful return.
		*/
		if (buf->ops->steal(pipe, buf))
		goto find_page;

		page = buf->page;
		if (add_to_page_cache(page, mapping, index, GFP_KERNEL)) {
		unlock_page(page);
		goto find_page;
		}

		page_cache_get(page);

		if (!(buf->flags & PIPE_BUF_FLAG_LRU))
		lru_cache_add(page);
		} else {
		find_page:
		page = find_lock_page(mapping, index);
		if (!page) {
		@@ -617,37 +593,6 @@ find_page:
		goto out;
		}

		/*
		* We get here with the page locked. If the page is also
		* uptodate, we don't need to do more. If it isn't, we
		* may need to bring it in if we are not going to overwrite
		* the full page.
		*/
		if (!PageUptodate(page)) {
		if (this_len < PAGE_CACHE_SIZE) {
		ret = mapping->a_ops->readpage(file, page);
		if (unlikely(ret))
		goto out;

		lock_page(page);

		if (!PageUptodate(page)) {
		/*
		* Page got invalidated, repeat.
		*/
		if (!page->mapping) {
		unlock_page(page);
		page_cache_release(page);
		goto find_page;
		}
		ret = -EIO;
		goto out;
		}
		} else
		SetPageUptodate(page);
		}
		}

		ret = mapping->a_ops->prepare_write(file, page, offset, offset+this_len);
		if (unlikely(ret)) {
		loff_t isize = i_size_read(mapping->host);
		@@ -706,7 +651,7 @@ out_ret:
		* key here is the 'actor' worker passed in that actually moves the data
		* to the wanted destination. See pipe_to_file/pipe_to_sendpage above.
		*/
		static ssize_t __splice_from_pipe(struct pipe_inode_info *pipe,
		ssize_t __splice_from_pipe(struct pipe_inode_info *pipe,
		struct file out, loff_t ppos, size_t len,
		unsigned int flags, splice_actor *actor)
		{
		@@ -802,6 +747,7 @@ static ssize_t __splice_from_pipe(struct pipe_inode_info *pipe,

		return ret;
		}
		EXPORT_SYMBOL(__splice_from_pipe);

		ssize_t splice_from_pipe(struct pipe_inode_info pipe, struct file out,
		loff_t *ppos, size_t len, unsigned int flags,

include/linux/pipe_fs_i.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -99,4 +99,8 @@ extern ssize_t splice_from_pipe(struct pipe_inode_info , struct file ,
		loff_t *, size_t, unsigned int,
		splice_actor *);

		extern ssize_t __splice_from_pipe(struct pipe_inode_info , struct file ,
		loff_t *, size_t, unsigned int,
		splice_actor *);

		#endif

mm/bounce.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@ static void __blk_queue_bounce(request_queue_t q, struct bio *bio_orig,
		/*
		* is destination page below bounce pfn?
		*/
		if (page_to_pfn(page) < q->bounce_pfn)
		if (page_to_pfn(page) <= q->bounce_pfn)
		continue;

		/*

Admin message