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

Commit 0b15a3a5 authored by Eric Van Hensbergen's avatar Eric Van Hensbergen Committed by Eric Van Hensbergen
Browse files

9p: fix debug build error 



Fixes build problem with 9p when building with debug disabled.
Also contains some fixes for warnings which pop up when 
CONFIG_NET_9P_DEBUG is disabled.

Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent 2515ddc6

include/net/9p/9p.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -56,9 +56,9 @@ enum p9_debug_flags { 
	P9_DEBUG_PKT =		(1<<10),

	P9_DEBUG_PKT =		(1<<10),

};

};





#ifdef CONFIG_NET_9P_DEBUG

extern unsigned int p9_debug_level;

extern unsigned int p9_debug_level;





#ifdef CONFIG_NET_9P_DEBUG

#define P9_DPRINTK(level, format, arg...) \

#define P9_DPRINTK(level, format, arg...) \

do {  \

do {  \

	if ((p9_debug_level & level) == level) {\

	if ((p9_debug_level & level) == level) {\

net/9p/protocol.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ 
static int

static int

p9pdu_writef(struct p9_fcall *pdu, int optional, const char *fmt, ...);

p9pdu_writef(struct p9_fcall *pdu, int optional, const char *fmt, ...);





#ifdef CONFIG_NET_9P_DEBUG

void

void

p9pdu_dump(int way, struct p9_fcall *pdu)

p9pdu_dump(int way, struct p9_fcall *pdu)

{

{
@@ -81,6 +82,12 @@ p9pdu_dump(int way, struct p9_fcall *pdu) 
	else

	else

		P9_DPRINTK(P9_DEBUG_PKT, "]]](%d) %s\n", datalen, buf);

		P9_DPRINTK(P9_DEBUG_PKT, "]]](%d) %s\n", datalen, buf);

}

}

#else

void

p9pdu_dump(int way, struct p9_fcall *pdu)

{

}

#endif

EXPORT_SYMBOL(p9pdu_dump);

EXPORT_SYMBOL(p9pdu_dump);





void p9stat_free(struct p9_wstat *stbuf)

void p9stat_free(struct p9_wstat *stbuf)
@@ -542,8 +549,10 @@ int p9pdu_finalize(struct p9_fcall *pdu) 
	err = p9pdu_writef(pdu, 0, "d", size);

	err = p9pdu_writef(pdu, 0, "d", size);

	pdu->size = size;

	pdu->size = size;





#ifdef CONFIG_NET_9P_DEBUG

	if ((p9_debug_level & P9_DEBUG_PKT) == P9_DEBUG_PKT)

	if ((p9_debug_level & P9_DEBUG_PKT) == P9_DEBUG_PKT)

		p9pdu_dump(0, pdu);

		p9pdu_dump(0, pdu);

#endif





	P9_DPRINTK(P9_DEBUG_9P, ">>> size=%d type: %d tag: %d\n", pdu->size,

	P9_DPRINTK(P9_DEBUG_9P, ">>> size=%d type: %d tag: %d\n", pdu->size,

							pdu->id, pdu->tag);

							pdu->id, pdu->tag);

net/9p/trans_fd.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -678,11 +678,9 @@ static int p9_fd_request(struct p9_client *client, struct p9_req_t *req) 




static int p9_fd_cancel(struct p9_client *client, struct p9_req_t *req)

static int p9_fd_cancel(struct p9_client *client, struct p9_req_t *req)

{

{

	struct p9_trans_fd *ts = client->trans;

	struct p9_conn *m = ts->conn;

	int ret = 1;

	int ret = 1;





	P9_DPRINTK(P9_DEBUG_TRANS, "mux %p req %p\n", m, req);

	P9_DPRINTK(P9_DEBUG_TRANS, "client %p req %p\n", client, req);





	spin_lock(&client->lock);

	spin_lock(&client->lock);

	list_del(&req->req_list);

	list_del(&req->req_list);