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

Commit ceb804cd 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: Skip check for mandatory locks when unlocking
  9p: Fixes a simple bug enabling writes beyond 2GB.
  9p: Change the name of new protocol from 9p2010.L to 9p2000.L
  fs/9p: re-init the wstat in readdir loop
  net/9p: Add sysfs mount_tag file for virtio 9P device
  net/9p: Use the tag name in the config space for identifying mount point
parents 3474cbd1 f78233dd

fs/9p/v9fs.h

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
/**

 * enum p9_session_flags - option flags for each 9P session

 * @V9FS_PROTO_2000U: whether or not to use 9P2000.u extensions

 * @V9FS_PROTO_2010L: whether or not to use 9P2010.l extensions

 * @V9FS_PROTO_2000L: whether or not to use 9P2000.l extensions

 * @V9FS_ACCESS_SINGLE: only the mounting user can access the hierarchy

 * @V9FS_ACCESS_USER: a new attach will be issued for every user (default)

 * @V9FS_ACCESS_ANY: use a single attach for all users
@@ -34,7 +34,7 @@ 
 */

enum p9_session_flags {

	V9FS_PROTO_2000U	= 0x01,

	V9FS_PROTO_2010L	= 0x02,

	V9FS_PROTO_2000L	= 0x02,

	V9FS_ACCESS_SINGLE	= 0x04,

	V9FS_ACCESS_USER	= 0x08,

	V9FS_ACCESS_ANY		= 0x0C,
@@ -130,5 +130,5 @@ static inline int v9fs_proto_dotu(struct v9fs_session_info *v9ses) 


static inline int v9fs_proto_dotl(struct v9fs_session_info *v9ses)

{

	return v9ses->flags & V9FS_PROTO_2010L;

	return v9ses->flags & V9FS_PROTO_2000L;

}

fs/9p/vfs_dir.c

+10 −1
Original line number Diff line number Diff line
@@ -76,6 +76,15 @@ static inline int dt_type(struct p9_wstat *mistat) 
	return rettype;

}



static void p9stat_init(struct p9_wstat *stbuf)

{

	stbuf->name  = NULL;

	stbuf->uid   = NULL;

	stbuf->gid   = NULL;

	stbuf->muid  = NULL;

	stbuf->extension = NULL;

}



/**

 * v9fs_dir_readdir - read a directory

 * @filp: opened file structure
@@ -131,8 +140,8 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir) 
			rdir->head = 0;

			rdir->tail = err;

		}



		while (rdir->head < rdir->tail) {

			p9stat_init(&st);

			err = p9stat_read(rdir->buf + rdir->head,

						buflen - rdir->head, &st,

						fid->clnt->proto_version);

fs/9p/vfs_file.c

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl) 
	P9_DPRINTK(P9_DEBUG_VFS, "filp: %p lock: %p\n", filp, fl);



	/* No mandatory locks */

	if (__mandatory_lock(inode))

	if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)

		return -ENOLCK;



	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) {
@@ -215,7 +215,7 @@ v9fs_file_write(struct file *filp, const char __user * data, 
	struct p9_fid *fid;

	struct p9_client *clnt;

	struct inode *inode = filp->f_path.dentry->d_inode;

	int origin = *offset;

	loff_t origin = *offset;

	unsigned long pg_start, pg_end;



	P9_DPRINTK(P9_DEBUG_VFS, "data %p count %d offset %x\n", data,

include/linux/virtio.h

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ struct virtio_device { 
	void *priv;

};



#define dev_to_virtio(dev) container_of(dev, struct virtio_device, dev)

int register_virtio_device(struct virtio_device *dev);

void unregister_virtio_device(struct virtio_device *dev);

include/linux/virtio_9p.h

+12 −0
Original line number Diff line number Diff line
@@ -5,4 +5,16 @@ 
#include <linux/virtio_ids.h>

#include <linux/virtio_config.h>



/* The feature bitmap for virtio 9P */



/* The mount point is specified in a config variable */

#define VIRTIO_9P_MOUNT_TAG 0



struct virtio_9p_config {

	/* length of the tag name */

	__u16 tag_len;

	/* non-NULL terminated tag name */

	__u8 tag[0];

} __attribute__((packed));



#endif /* _LINUX_VIRTIO_9P_H */