Commit b4d0b08a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 33217379 e45c5405

fs/9p/vfs_file.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ v9fs_file_read(struct file *filp, char __user *udata, size_t count, 
	int ret;

	struct p9_fid *fid;



	P9_DPRINTK(P9_DEBUG_VFS, "count %d offset %lld\n", count, *offset);

	P9_DPRINTK(P9_DEBUG_VFS, "count %zu offset %lld\n", count, *offset);

	fid = filp->private_data;



	if (count > (fid->clnt->msize - P9_IOHDRSZ))

include/net/9p/9p.h

+1 −1
Original line number Diff line number Diff line
@@ -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) {\

include/net/9p/client.h

+2 −0
Original line number Diff line number Diff line
@@ -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 *);

net/9p/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ config NET_9P_VIRTIO 
	  This builds support for a transports between

	  guest partitions and a host partition.



config NET_9P_RDMA

	depends on NET_9P && INFINIBAND && EXPERIMENTAL

	tristate "9P RDMA Transport (Experimental)"

	help

	  This builds support for a RDMA transport.



config NET_9P_DEBUG

	bool "Debug information"

	depends on NET_9P

net/9p/Makefile

+4 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_NET_9P) := 9pnet.o

obj-$(CONFIG_NET_9P_VIRTIO) += 9pnet_virtio.o

obj-$(CONFIG_NET_9P_RDMA) += 9pnet_rdma.o



9pnet-objs := \

	mod.o \
@@ -11,3 +12,6 @@ obj-$(CONFIG_NET_9P_VIRTIO) += 9pnet_virtio.o 


9pnet_virtio-objs := \

	trans_virtio.o \



9pnet_rdma-objs := \

	trans_rdma.o \