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

Commit 729eb528 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  relay: set an spd_release() hook for splice
  set relay file can not be read by pread(2)
parents c8237a5f 5eb7f9fa

kernel/relay.c

+6 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ static int relay_file_open(struct inode *inode, struct file *filp) 
	kref_get(&buf->kref);

	filp->private_data = buf;



	return 0;

	return nonseekable_open(inode, filp);

}



/**
@@ -1056,6 +1056,10 @@ static struct pipe_buf_operations relay_pipe_buf_ops = { 
	.get = generic_pipe_buf_get,

};



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

{

}



/*

 *	subbuf_splice_actor - splice up to one subbuf's worth of data

 */
@@ -1083,6 +1087,7 @@ static int subbuf_splice_actor(struct file *in, 
		.partial = partial,

		.flags = flags,

		.ops = &relay_pipe_buf_ops,

		.spd_release = relay_page_release,

	};



	if (rbuf->subbufs_produced == rbuf->subbufs_consumed)