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

Commit 01e7ae8c 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: v9fs_vfs_rename incorrect clunk order
  9p: fix memleak in fs/9p/v9fs.c
  9p: add virtio transport
parents 11763609 22150c4f

Documentation/filesystems/9p.txt

+5 −3
Original line number Original line Diff line number Diff line
@@ -46,6 +46,8 @@ OPTIONS 
			tcp	- specifying a normal TCP/IP connection

			tcp	- specifying a normal TCP/IP connection

			fd   	- used passed file descriptors for connection

			fd   	- used passed file descriptors for connection

                                (see rfdno and wfdno)

                                (see rfdno and wfdno)

			virtio	- connect to the next virtio channel available

				(from lguest or KVM with trans_virtio module)





  uname=name	user name to attempt mount as on the remote server.  The

  uname=name	user name to attempt mount as on the remote server.  The

  		server may override or ignore this value.  Certain user

  		server may override or ignore this value.  Certain user

fs/9p/v9fs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -162,6 +162,7 @@ static void v9fs_parse_options(struct v9fs_session_info *v9ses) 
				if (*e != '\0')

				if (*e != '\0')

					v9ses->uid = ~0;

					v9ses->uid = ~0;

			}

			}

			kfree(s);

			break;

			break;





		default:

		default:

fs/9p/vfs_inode.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -687,10 +687,10 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	retval = p9_client_wstat(oldfid, &wstat);

	retval = p9_client_wstat(oldfid, &wstat);





clunk_newdir:

clunk_newdir:

	p9_client_clunk(olddirfid);

	p9_client_clunk(newdirfid);





clunk_olddir:

clunk_olddir:

	p9_client_clunk(newdirfid);

	p9_client_clunk(olddirfid);





done:

done:

	return retval;

	return retval;

include/linux/virtio_9p.h

0 → 100644
+10 −0
Original line number Original line Diff line number Diff line 
#ifndef _LINUX_VIRTIO_9P_H

#define _LINUX_VIRTIO_9P_H

#include <linux/virtio_config.h>



/* The ID for virtio console */

#define VIRTIO_ID_9P	9

/* Maximum number of virtio channels per partition (1 for now) */

#define MAX_9P_CHAN	1



#endif /* _LINUX_VIRTIO_9P_H */

net/9p/Kconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,13 @@ config NET_9P_FD 
	  file descriptors.  TCP/IP is the default transport for 9p,

	  file descriptors.  TCP/IP is the default transport for 9p,

	  so if you are going to use 9p, you'll likely want this.

	  so if you are going to use 9p, you'll likely want this.





config NET_9P_VIRTIO

	depends on NET_9P && EXPERIMENTAL && VIRTIO

	tristate "9P Virtio Transport (Experimental)"

	help

	  This builds support for a transports between

	  guest partitions and a host partition.



config NET_9P_DEBUG

config NET_9P_DEBUG

	bool "Debug information"

	bool "Debug information"

	depends on NET_9P

	depends on NET_9P