diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-09-08 16:27:31 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-08 16:27:31 +0900 |
commit | e7a963ef20cabde53d0e609737764ddc65f4605a (patch) | |
tree | d2bf292f2dde9c6ee213d401abbbdc63fb3afa75 /net/9p/trans_fd.c | |
parent | a2494b9b5fb702becaf8d8e3138f7a1a0d3c537e (diff) | |
parent | 3ff323f89075624b6891e7c428edb8e8a35be13c (diff) |
Merge branches 'sh/smp' and 'sh/stable-updates'
Diffstat (limited to 'net/9p/trans_fd.c')
-rw-r--r-- | net/9p/trans_fd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index 8c2588e4edc..8d934dd7fd5 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c @@ -119,8 +119,8 @@ struct p9_poll_wait { * @wpos: write position for current frame * @wsize: amount of data to write for current frame * @wbuf: current write buffer + * @poll_pending_link: pending links to be polled per conn * @poll_wait: array of wait_q's for various worker threads - * @poll_waddr: ???? * @pt: poll state * @rq: current read work * @wq: current write work @@ -700,9 +700,9 @@ static int p9_fd_cancel(struct p9_client *client, struct p9_req_t *req) } /** - * parse_options - parse mount options into session structure - * @options: options string passed from mount - * @opts: transport-specific structure to parse options into + * parse_opts - parse mount options into p9_fd_opts structure + * @params: options string passed from mount + * @opts: fd transport-specific structure to parse options into * * Returns 0 upon success, -ERRNO upon failure */ |