Commit bbdfc2f7 authored by Jens Axboe's avatar Jens Axboe Committed by David S. Miller
Browse files

[SPLICE]: Don't assume regular pages in splice_to_pipe() 



Allow caller to pass in a release function, there might be
other resources that need releasing as well. Needed for
network receive.

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d10f2150

fs/splice.c

+8 −1
Original line number Diff line number Diff line
@@ -254,11 +254,16 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe, 
	}



	while (page_nr < spd_pages)

		page_cache_release(spd->pages[page_nr++]);

		spd->spd_release(spd, page_nr++);



	return ret;

}



static void spd_release_page(struct splice_pipe_desc *spd, unsigned int i)

{

	page_cache_release(spd->pages[i]);

}



static int

__generic_file_splice_read(struct file *in, loff_t *ppos,

			   struct pipe_inode_info *pipe, size_t len,
@@ -277,6 +282,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, 
		.partial = partial,

		.flags = flags,

		.ops = &page_cache_pipe_buf_ops,

		.spd_release = spd_release_page,

	};



	index = *ppos >> PAGE_CACHE_SHIFT;
@@ -1432,6 +1438,7 @@ static long vmsplice_to_pipe(struct file *file, const struct iovec __user *iov, 
		.partial = partial,

		.flags = flags,

		.ops = &user_page_pipe_buf_ops,

		.spd_release = spd_release_page,

	};



	pipe = pipe_info(file->f_path.dentry->d_inode);

include/linux/splice.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct splice_pipe_desc { 
	int nr_pages;			/* number of pages in map */

	unsigned int flags;		/* splice flags */

	const struct pipe_buf_operations *ops;/* ops associated with output pipe */

	void (*spd_release)(struct splice_pipe_desc *, unsigned int);

};



typedef int (splice_actor)(struct pipe_inode_info *, struct pipe_buffer *,