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

9p: fix debug build error

Browse Source 
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: Eric Van Hensbergen <ericvh@gmail.com>
This commit is contained in:
Eric Van Hensbergen 2008-10-22 18:47:40 -05:00 committed by Eric Van Hensbergen
parent 2515ddc6db
commit 0b15a3a528
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/9p/9p.h
View File

@ -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) {\

9
net/9p/protocol.c
View File

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

4
net/9p/trans_fd.c
View File

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