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

Commit 7bf2d1df authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro
Browse files

pipe: add pipe_buf_get() helper 



Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a7c22421

fs/fuse/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -1963,7 +1963,7 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe, 
			pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);

			pipe->nrbufs--;

		} else {

			ibuf->ops->get(pipe, ibuf);

			pipe_buf_get(pipe, ibuf);

			*obuf = *ibuf;

			obuf->flags &= ~PIPE_BUF_FLAG_GIFT;

			obuf->len = rem;

fs/splice.c

+2 −2
Original line number Diff line number Diff line
@@ -1596,7 +1596,7 @@ static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe, 
			 * Get a reference to this pipe buffer,

			 * so we can copy the contents over.

			 */

			ibuf->ops->get(ipipe, ibuf);

			pipe_buf_get(ipipe, ibuf);

			*obuf = *ibuf;



			/*
@@ -1668,7 +1668,7 @@ static int link_pipe(struct pipe_inode_info *ipipe, 
		 * Get a reference to this pipe buffer,

		 * so we can copy the contents over.

		 */

		ibuf->ops->get(ipipe, ibuf);

		pipe_buf_get(ipipe, ibuf);



		obuf = opipe->bufs + nbuf;

		*obuf = *ibuf;

include/linux/pipe_fs_i.h

+11 −0
Original line number Diff line number Diff line
@@ -115,6 +115,17 @@ struct pipe_buf_operations { 
	void (*get)(struct pipe_inode_info *, struct pipe_buffer *);

};



/**

 * pipe_buf_get - get a reference to a pipe_buffer

 * @pipe:	the pipe that the buffer belongs to

 * @buf:	the buffer to get a reference to

 */

static inline void pipe_buf_get(struct pipe_inode_info *pipe,

				struct pipe_buffer *buf)

{

	buf->ops->get(pipe, buf);

}



/* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual

   memory allocation, whereas PIPE_BUF makes atomicity guarantees.  */

#define PIPE_SIZE		PAGE_SIZE