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

Commit b76225e2 authored by Harsh Prateek Bora's avatar Harsh Prateek Bora Committed by Eric Van Hensbergen
Browse files

net/9p: nwname should be an unsigned int 



Signed-off-by: default avatarHarsh Prateek Bora <harsh@linux.vnet.ibm.com>
Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: default avatarEric VAn Hensbergen <ericvh@gmail.com>
parent bd8c8ade

include/net/9p/client.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -218,8 +218,8 @@ void p9_client_disconnect(struct p9_client *clnt); 
void p9_client_begin_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,

struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,

					char *uname, u32 n_uname, char *aname);

					char *uname, u32 n_uname, char *aname);

struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames,

struct p9_fid *p9_client_walk(struct p9_fid *oldfid, uint16_t nwname,

								int clone);

		char **wnames, int clone);

int p9_client_open(struct p9_fid *fid, int mode);

int p9_client_open(struct p9_fid *fid, int mode);

int p9_client_fcreate(struct p9_fid *fid, char *name, u32 perm, int mode,

int p9_client_fcreate(struct p9_fid *fid, char *name, u32 perm, int mode,

							char *extension);

							char *extension);

net/9p/client.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -929,15 +929,15 @@ error: 
}

}

EXPORT_SYMBOL(p9_client_attach);

EXPORT_SYMBOL(p9_client_attach);





struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames,

struct p9_fid *p9_client_walk(struct p9_fid *oldfid, uint16_t nwname,

	int clone)

		char **wnames, int clone)

{

{

	int err;

	int err;

	struct p9_client *clnt;

	struct p9_client *clnt;

	struct p9_fid *fid;

	struct p9_fid *fid;

	struct p9_qid *wqids;

	struct p9_qid *wqids;

	struct p9_req_t *req;

	struct p9_req_t *req;

	int16_t nwqids, count;

	uint16_t nwqids, count;





	err = 0;

	err = 0;

	wqids = NULL;

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

		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);

		oldfid->fid, fid->fid, nwname, wnames ? wnames[0] : NULL);





	req = p9_client_rpc(clnt, P9_TWALK, "ddT", oldfid->fid, fid->fid,

	req = p9_client_rpc(clnt, P9_TWALK, "ddT", oldfid->fid, fid->fid,

net/9p/protocol.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -265,7 +265,7 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt, 
			}

			}

			break;

			break;

		case 'T':{

		case 'T':{

				int16_t *nwname = va_arg(ap, int16_t *);

				uint16_t *nwname = va_arg(ap, uint16_t *);

				char ***wnames = va_arg(ap, char ***);

				char ***wnames = va_arg(ap, char ***);





				errcode = p9pdu_readf(pdu, proto_version,

				errcode = p9pdu_readf(pdu, proto_version,
@@ -496,7 +496,7 @@ p9pdu_vwritef(struct p9_fcall *pdu, int proto_version, const char *fmt, 
			}

			}

			break;

			break;

		case 'T':{

		case 'T':{

				int16_t nwname = va_arg(ap, int);

				uint16_t nwname = va_arg(ap, int);

				const char **wnames = va_arg(ap, const char **);

				const char **wnames = va_arg(ap, const char **);





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

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