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

Commit 1421e986 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:
  fs/9p: Don't use dotl version of mknod for dotu inode operations
  fs/9p: Use the correct dentry operations
  9p: Check for NULL fid in v9fs_dir_release()
  fs/9p: Fix error handling in v9fs_get_sb
  fs/9p, net/9p: memory leak fixes
parents 2bb3a259 1d76e313

fs/9p/vfs_dir.c

+4 −2
Original line number Diff line number Diff line
@@ -292,8 +292,10 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) 


	fid = filp->private_data;

	P9_DPRINTK(P9_DEBUG_VFS,

			"inode: %p filp: %p fid: %d\n", inode, filp, fid->fid);

			"v9fs_dir_release: inode: %p filp: %p fid: %d\n",

			inode, filp, fid ? fid->fid : -1);

	filemap_write_and_wait(inode->i_mapping);

	if (fid)

		p9_client_clunk(fid);

	return 0;

}

fs/9p/vfs_inode.c

+7 −2
Original line number Diff line number Diff line
@@ -730,7 +730,10 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int mode, 
		P9_DPRINTK(P9_DEBUG_VFS, "inode creation failed %d\n", err);

		goto error;

	}

	if (v9ses->cache)

		dentry->d_op = &v9fs_cached_dentry_operations;

	else

		dentry->d_op = &v9fs_dentry_operations;

	d_instantiate(dentry, inode);

	err = v9fs_fid_add(dentry, fid);

	if (err < 0)
@@ -1128,6 +1131,7 @@ v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, 
	v9fs_stat2inode(st, dentry->d_inode, dentry->d_inode->i_sb);

		generic_fillattr(dentry->d_inode, stat);



	p9stat_free(st);

	kfree(st);

	return 0;

}
@@ -1489,6 +1493,7 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen) 


	retval = strnlen(buffer, buflen);

done:

	p9stat_free(st);

	kfree(st);

	return retval;

}
@@ -1942,7 +1947,7 @@ static const struct inode_operations v9fs_dir_inode_operations_dotu = { 
	.unlink = v9fs_vfs_unlink,

	.mkdir = v9fs_vfs_mkdir,

	.rmdir = v9fs_vfs_rmdir,

	.mknod = v9fs_vfs_mknod_dotl,

	.mknod = v9fs_vfs_mknod,

	.rename = v9fs_vfs_rename,

	.getattr = v9fs_vfs_getattr,

	.setattr = v9fs_vfs_setattr,

fs/9p/vfs_super.c

+14 −6
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags, 
	fid = v9fs_session_init(v9ses, dev_name, data);

	if (IS_ERR(fid)) {

		retval = PTR_ERR(fid);

		/*

		 * we need to call session_close to tear down some

		 * of the data structure setup by session_init

		 */

		goto close_session;

	}
@@ -144,7 +148,6 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags, 
		retval = -ENOMEM;

		goto release_sb;

	}



	sb->s_root = root;



	if (v9fs_proto_dotl(v9ses)) {
@@ -152,7 +155,7 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags, 
		st = p9_client_getattr_dotl(fid, P9_STATS_BASIC);

		if (IS_ERR(st)) {

			retval = PTR_ERR(st);

			goto clunk_fid;

			goto release_sb;

		}



		v9fs_stat2inode_dotl(st, root->d_inode);
@@ -162,7 +165,7 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags, 
		st = p9_client_stat(fid);

		if (IS_ERR(st)) {

			retval = PTR_ERR(st);

			goto clunk_fid;

			goto release_sb;

		}



		root->d_inode->i_ino = v9fs_qid2ino(&st->qid);
@@ -180,13 +183,18 @@ P9_DPRINTK(P9_DEBUG_VFS, " simple set mount, return 0\n"); 


clunk_fid:

	p9_client_clunk(fid);



close_session:

	v9fs_session_close(v9ses);

	kfree(v9ses);

	return retval;



release_sb:

	/*

	 * we will do the session_close and root dentry release

	 * in the below call. But we need to clunk fid, because we haven't

	 * attached the fid to dentry so it won't get clunked

	 * automatically.

	 */

	p9_client_clunk(fid);

	deactivate_locked_super(sb);

	return retval;

}

net/9p/client.c

+6 −1
Original line number Diff line number Diff line
@@ -331,8 +331,10 @@ static void p9_tag_cleanup(struct p9_client *c) 
		}

	}



	if (c->tagpool)

	if (c->tagpool) {

		p9_idpool_put(0, c->tagpool); /* free reserved tag 0 */

		p9_idpool_destroy(c->tagpool);

	}



	/* free requests associated with tags */

	for (row = 0; row < (c->max_tag/P9_ROW_MAXTAG); row++) {
@@ -944,6 +946,7 @@ struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames, 
	int16_t nwqids, count;



	err = 0;

	wqids = NULL;

	clnt = oldfid->clnt;

	if (clone) {

		fid = p9_fid_create(clnt);
@@ -994,9 +997,11 @@ struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames, 
	else

		fid->qid = oldfid->qid;



	kfree(wqids);

	return fid;



clunk_fid:

	kfree(wqids);

	p9_client_clunk(fid);

	fid = NULL;