leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel/relay.c: remove unused function argument actor

Browse Source 
Currently argument `actor' is never used in the relay reading path, so
remove it.

Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
zhangwei(Jovi) 2013-04-30 15:28:39 -07:00 committed by Linus Torvalds
parent 4d10e0f2dd
commit 8359f689e2
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/relay.c
View File

@ -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, static int subbuf_read_actor(size_t read_start,
struct rchan_buf *buf, struct rchan_buf *buf,
size_t avail, size_t avail,
read_descriptor_t *desc, read_descriptor_t *desc)
read_actor_t actor)
{ {
void *from; void *from;
int ret = 0; 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, typedef int (*subbuf_actor_t) (size_t read_start,
struct rchan_buf *buf, struct rchan_buf *buf,
size_t avail, size_t avail,
read_descriptor_t *desc, read_descriptor_t *desc);
read_actor_t actor);
/* /*
* relay_file_read_subbufs - read count bytes, bridging subbuf boundaries * relay_file_read_subbufs - read count bytes, bridging subbuf boundaries
*/ */
static ssize_t relay_file_read_subbufs(struct file *filp, loff_t *ppos, static ssize_t relay_file_read_subbufs(struct file *filp, loff_t *ppos,
subbuf_actor_t subbuf_actor, subbuf_actor_t subbuf_actor,
read_actor_t actor,
read_descriptor_t *desc) read_descriptor_t *desc)
{ {
struct rchan_buf *buf = filp->private_data; 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; break;
avail = min(desc->count, avail); 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) if (desc->error < 0)
break; break;
@ -1174,8 +1171,7 @@ static ssize_t relay_file_read(struct file *filp,
desc.count = count; desc.count = count;
desc.arg.buf = buffer; desc.arg.buf = buffer;
desc.error = 0; desc.error = 0;
return relay_file_read_subbufs(filp, ppos, subbuf_read_actor, return relay_file_read_subbufs(filp, ppos, subbuf_read_actor, &desc);
NULL, &desc);
} }
static void relay_consume_bytes(struct rchan_buf *rbuf, int bytes_consumed) static void relay_consume_bytes(struct rchan_buf *rbuf, int bytes_consumed)