Skip to content

Commit

Permalink
net/9p: nwname should be an unsigned int
Browse files Browse the repository at this point in the history
Signed-off-by: Harsh Prateek Bora <[email protected]>
Signed-off-by: Venkateswararao Jujjuri <[email protected]>
Signed-off-by: Eric VAn Hensbergen <[email protected]>
  • Loading branch information
Harsh Prateek Bora authored and ericvh committed Apr 15, 2011
1 parent bd8c8ad commit b76225e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions include/net/9p/client.h
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ void p9_client_disconnect(struct p9_client *clnt);
void p9_client_begin_disconnect(struct p9_client *clnt);
struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,
char *uname, u32 n_uname, char *aname);
struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames,
int clone);
struct p9_fid *p9_client_walk(struct p9_fid *oldfid, uint16_t nwname,
char **wnames, int clone);
int p9_client_open(struct p9_fid *fid, int mode);
int p9_client_fcreate(struct p9_fid *fid, char *name, u32 perm, int mode,
char *extension);
Expand Down
8 changes: 4 additions & 4 deletions net/9p/client.c
Original file line number Diff line number Diff line change
Expand Up @@ -929,15 +929,15 @@ struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,
}
EXPORT_SYMBOL(p9_client_attach);

struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames,
int clone)
struct p9_fid *p9_client_walk(struct p9_fid *oldfid, uint16_t nwname,
char **wnames, int clone)
{
int err;
struct p9_client *clnt;
struct p9_fid *fid;
struct p9_qid *wqids;
struct p9_req_t *req;
int16_t nwqids, count;
uint16_t nwqids, count;

err = 0;
wqids = NULL;
Expand All @@ -955,7 +955,7 @@ struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames,
fid = oldfid;


P9_DPRINTK(P9_DEBUG_9P, ">>> TWALK fids %d,%d nwname %d wname[0] %s\n",
P9_DPRINTK(P9_DEBUG_9P, ">>> TWALK fids %d,%d nwname %ud wname[0] %s\n",
oldfid->fid, fid->fid, nwname, wnames ? wnames[0] : NULL);

req = p9_client_rpc(clnt, P9_TWALK, "ddT", oldfid->fid, fid->fid,
Expand Down
4 changes: 2 additions & 2 deletions net/9p/protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt,
}
break;
case 'T':{
int16_t *nwname = va_arg(ap, int16_t *);
uint16_t *nwname = va_arg(ap, uint16_t *);
char ***wnames = va_arg(ap, char ***);

errcode = p9pdu_readf(pdu, proto_version,
Expand Down Expand Up @@ -496,7 +496,7 @@ p9pdu_vwritef(struct p9_fcall *pdu, int proto_version, const char *fmt,
}
break;
case 'T':{
int16_t nwname = va_arg(ap, int);
uint16_t nwname = va_arg(ap, int);
const char **wnames = va_arg(ap, const char **);

errcode = p9pdu_writef(pdu, proto_version, "w",
Expand Down

0 comments on commit b76225e

Please sign in to comment.