relay: remove unused function argument actor
PATCH 1/2 relay: remove unused function argument actor
Currently argument actor is never used in relay reading path, so remote it.
Signed-off-by zhangwei(Jovi) <[email protected]>
--- kernel/relay.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
kernel/relay.c +4 -8
@@ -1099,8 +1099,7 @@ static size_t relay_file_read_end_pos(struct rchan_buf *buf,static int subbuf_read_actor (size_t read_start,struct rchan_buf *buf,size_t avail, -read_descriptor_t *desc, -read_actor_t actor) +read_descriptor_t *desc) {void *from;int ret =0 ;
@@ -1121,15 +1120,13 @@ static int subbuf_read_actor(size_t read_start,typedef int (*subbuf_actor_t ) (size_t read_start,struct rchan_buf *buf,size_t avail, -read_descriptor_t *desc, -read_actor_t actor); +read_descriptor_t *desc);/* * relay_file_read_subbufs - read count bytes, bridging subbuf boundaries */ static ssize_t relay_file_read_subbufs (struct file *filp,loff_t *ppos,subbuf_actor_t subbuf_actor, -read_actor_t actor,read_descriptor_t *desc) {struct rchan_buf *buf = filp->private_data;
@@ -1150,7 +1147,7 @@ static ssize_t relay_file_read_subbufs(struct file *filp, loff_t *ppos,break ; avail =min (desc->count, avail); - ret =subbuf_actor (read_start, buf, avail, desc, actor); + ret =subbuf_actor (read_start, buf, avail, desc);if (desc->error <0 )break ;
@@ -1174,8 +1171,7 @@ static ssize_t relay_file_read(struct file *filp, desc.count = count; desc.arg.buf = buffer; desc.error =0 ; -return relay_file_read_subbufs (filp, ppos, subbuf_read_actor, -NULL , &desc); +return relay_file_read_subbufs (filp, ppos, subbuf_read_actor, &desc); }static void relay_consume_bytes (struct rchan_buf *rbuf,int bytes_consumed)
Signature · 1 line
1.7.9.7