Revert "fs/9p: Eliminate redundant non-cache path in mknod"

This reverts commit 2dc92e5975a66e2b1b448fc3cbf7dc0846185284.

1 files changed, 26 insertions, 10 deletions

diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index f56b17b69aca..4a8606e3b0f9 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -840,17 +840,33 @@ v9fs_vfs_mknod_dotl(struct mnt_idmap *idmap, struct inode *dir,
 			 err);
 		goto error;
 	}
-	inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb);
-	if (IS_ERR(inode)) {
-		err = PTR_ERR(inode);
-		p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n",
-			 err);
-		goto error;
+
+	/* instantiate inode and assign the unopened fid to the dentry */
+	if (v9ses->cache & (CACHE_META|CACHE_LOOSE)) {
+		inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb);
+		if (IS_ERR(inode)) {
+			err = PTR_ERR(inode);
+			p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n",
+				 err);
+			goto error;
+		}
+		v9fs_set_create_acl(inode, fid, dacl, pacl);
+		v9fs_fid_add(dentry, &fid);
+		d_instantiate(dentry, inode);
+		err = 0;
+	} else {
+		/*
+		 * Not in cached mode. No need to populate inode with stat.
+		 * socket syscall returns a fd, so we need instantiate
+		 */
+		inode = v9fs_get_inode(dir->i_sb, mode, rdev);
+		if (IS_ERR(inode)) {
+			err = PTR_ERR(inode);
+			goto error;
+		}
+		v9fs_set_create_acl(inode, fid, dacl, pacl);
+		d_instantiate(dentry, inode);
 	}
-	v9fs_set_create_acl(inode, fid, dacl, pacl);
-	v9fs_fid_add(dentry, &fid);
-	d_instantiate(dentry, inode);
-	err = 0;
 error:
 	p9_fid_put(fid);
 	v9fs_put_acl(dacl, pacl);