Unverified Commit fe1371d0 authored by Eric Van Hensbergen's avatar Eric Van Hensbergen
Browse files

fs/9p: switch vfsmount to use v9fs_get_new_inode 



In the process of cleaning up inode number allocation, I noticed several functions which didn't use the standard helper
allocators.  This patch fixes the allocation in the mount entrypoint.

Signed-off-by: default avatarEric Van Hensbergen <ericvh@kernel.org>
parent 6613476e

fs/9p/vfs_super.c

+1 −28
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags, 
	struct inode *inode = NULL;

	struct dentry *root = NULL;

	struct v9fs_session_info *v9ses = NULL;

	umode_t mode = 0777 | S_ISVTX;

	struct p9_fid *fid;

	int retval = 0;
@@ -140,7 +139,7 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags, 
	else

		sb->s_d_op = &v9fs_dentry_operations;



	inode = v9fs_get_inode(sb, S_IFDIR | mode, 0);

	inode = v9fs_get_new_inode_from_fid(v9ses, fid, sb);

	if (IS_ERR(inode)) {

		retval = PTR_ERR(inode);

		goto release_sb;
@@ -152,32 +151,6 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags, 
		goto release_sb;

	}

	sb->s_root = root;

	if (v9fs_proto_dotl(v9ses)) {

		struct p9_stat_dotl *st = NULL;



		st = p9_client_getattr_dotl(fid, P9_STATS_BASIC);

		if (IS_ERR(st)) {

			retval = PTR_ERR(st);

			goto release_sb;

		}

		d_inode(root)->i_ino = v9fs_qid2ino(&st->qid);

		v9fs_stat2inode_dotl(st, d_inode(root), 0);

		kfree(st);

	} else {

		struct p9_wstat *st = NULL;



		st = p9_client_stat(fid);

		if (IS_ERR(st)) {

			retval = PTR_ERR(st);

			goto release_sb;

		}



		d_inode(root)->i_ino = v9fs_qid2ino(&st->qid);

		v9fs_stat2inode(st, d_inode(root), sb, 0);



		p9stat_free(st);

		kfree(st);

	}

	retval = v9fs_get_acl(inode, fid);

	if (retval)

		goto release_sb;