Commit 3808330b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '9p-6.3-for-linus-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs 

Pull 9p updates from Eric Van Hensbergen:

 - some fixes and cleanup setting up for a larger set of performance
   patches I've been working on

 - a contributed fixes relating to 9p/rdma

 - some contributed fixes relating to 9p/xen

* tag '9p-6.3-for-linus-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  fs/9p: fix error reporting in v9fs_dir_release
  net/9p: fix bug in client create for .L
  9p/rdma: unmap receive dma buffer in rdma_request()/post_recv()
  9p/xen: fix connection sequence
  9p/xen: fix version parsing
  fs/9p: Expand setup of writeback cache to all levels
  net/9p: Adjust maximum MSIZE to account for p9 header
parents 6e110580 89c58cb3

fs/9p/v9fs.c

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses, 


#ifdef CONFIG_9P_FSCACHE

	/* register the session for caching */

	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {

	if (v9ses->cache == CACHE_FSCACHE) {

		rc = v9fs_cache_session_get_cookie(v9ses, dev_name);

		if (rc < 0)

			goto err_clnt;

fs/9p/vfs_addr.c

+0 −2
Original line number Diff line number Diff line
@@ -279,8 +279,6 @@ static int v9fs_write_begin(struct file *filp, struct address_space *mapping, 


	p9_debug(P9_DEBUG_VFS, "filp %p, mapping %p\n", filp, mapping);



	BUG_ON(!v9inode->writeback_fid);



	/* Prefetch area to be written into the cache if we're caching this

	 * file.  We need to do this before we get a lock on the page in case

	 * there's more than one writer competing for the same cache block.

fs/9p/vfs_dir.c

+4 −3
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int v9fs_dir_readdir_dotl(struct file *file, struct dir_context *ctx) 




/**

 * v9fs_dir_release - close a directory

 * v9fs_dir_release - called on a close of a file or directory

 * @inode: inode of the directory

 * @filp: file pointer to a directory

 *
@@ -209,6 +209,7 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) 
	struct p9_fid *fid;

	__le32 version;

	loff_t i_size;

	int retval = 0;



	fid = filp->private_data;

	p9_debug(P9_DEBUG_VFS, "inode: %p filp: %p fid: %d\n",
@@ -217,7 +218,7 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) 
		spin_lock(&inode->i_lock);

		hlist_del(&fid->ilist);

		spin_unlock(&inode->i_lock);

		p9_fid_put(fid);

		retval = p9_fid_put(fid);

	}



	if ((filp->f_mode & FMODE_WRITE)) {
@@ -228,7 +229,7 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) 
	} else {

		fscache_unuse_cookie(v9fs_inode_cookie(v9inode), NULL, NULL);

	}

	return 0;

	return retval;

}



const struct file_operations v9fs_dir_operations = {

fs/9p/vfs_file.c

+4 −3
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ int v9fs_file_open(struct inode *inode, struct file *file) 
	}



	mutex_lock(&v9inode->v_mutex);

	if ((v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) &&

	    !v9inode->writeback_fid &&

	if ((v9ses->cache) && !v9inode->writeback_fid &&

	    ((file->f_flags & O_ACCMODE) != O_RDONLY)) {

		/*

		 * clone a fid and add it to writeback_fid
@@ -93,9 +92,11 @@ int v9fs_file_open(struct inode *inode, struct file *file) 
		v9inode->writeback_fid = (void *) writeback_fid;

	}

	mutex_unlock(&v9inode->v_mutex);

	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)

#ifdef CONFIG_9P_FSCACHE

	if (v9ses->cache == CACHE_FSCACHE)

		fscache_use_cookie(v9fs_inode_cookie(v9inode),

				   file->f_mode & FMODE_WRITE);

#endif

	v9fs_open_fid_add(inode, &fid);

	return 0;

out_error:

fs/9p/vfs_inode.c

+1 −2
Original line number Diff line number Diff line
@@ -843,8 +843,7 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry, 
	inode = d_inode(dentry);

	v9inode = V9FS_I(inode);

	mutex_lock(&v9inode->v_mutex);

	if ((v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) &&

	    !v9inode->writeback_fid &&

	if ((v9ses->cache) && !v9inode->writeback_fid &&

	    ((flags & O_ACCMODE) != O_RDONLY)) {

		/*

		 * clone a fid and add it to writeback_fid