diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 21:14:45 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 21:14:45 +0400 |
| commit | b4d0b08a4c3947c6ac004c9d83154ec5999c1861 (patch) | |
| tree | c0f3ece1274d868c6288cc2843918c31b4885f43 /include | |
| parent | 33217379becdee25021cabb25032b3bf703d0e96 (diff) | |
| parent | e45c5405e12c7cef93940cb7a541ab459ec0096a (diff) | |
| download | linux-b4d0b08a4c3947c6ac004c9d83154ec5999c1861.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: fix sparse warnings
9p: rdma: RDMA Transport Support for 9P
9p: fix format warning
9p: fix debug build error
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/9p/9p.h | 2 | ||||
| -rw-r--r-- | include/net/9p/client.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h index d2c60c73619d..b77c1478c99f 100644 --- a/include/net/9p/9p.h +++ b/include/net/9p/9p.h @@ -56,9 +56,9 @@ enum p9_debug_flags { P9_DEBUG_PKT = (1<<10), }; +#ifdef CONFIG_NET_9P_DEBUG extern unsigned int p9_debug_level; -#ifdef CONFIG_NET_9P_DEBUG #define P9_DPRINTK(level, format, arg...) \ do { \ if ((p9_debug_level & level) == level) {\ diff --git a/include/net/9p/client.h b/include/net/9p/client.h index 1f17f3d93727..4012e07162e5 100644 --- a/include/net/9p/client.h +++ b/include/net/9p/client.h @@ -182,6 +182,7 @@ struct p9_fid { struct list_head dlist; /* list of all fids attached to a dentry */ }; +int p9_client_version(struct p9_client *); struct p9_client *p9_client_create(const char *dev_name, char *options); void p9_client_destroy(struct p9_client *clnt); void p9_client_disconnect(struct p9_client *clnt); @@ -206,6 +207,7 @@ int p9_client_wstat(struct p9_fid *fid, struct p9_wstat *wst); struct p9_req_t *p9_tag_lookup(struct p9_client *, u16); void p9_client_cb(struct p9_client *c, struct p9_req_t *req); +int p9_parse_header(struct p9_fcall *, int32_t *, int8_t *, int16_t *, int); int p9stat_read(char *, int, struct p9_wstat *, int); void p9stat_free(struct p9_wstat *); |