X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzpl_inode.c;fp=module%2Fzfs%2Fzpl_inode.c;h=029a4038b10b411611cc1827e409f19b081de15a;hb=c85b224fafacafa49817101f26f0a9760a8d05d1;hp=fcc19b00436699d892c877d9f741b123e9f63ef0;hpb=d433c206515e567c52ce09589033405a0ae3716e;p=zfs.git

diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
index fcc19b0..029a403 100644
--- a/module/zfs/zpl_inode.c
+++ b/module/zfs/zpl_inode.c
@@ -66,14 +66,10 @@ zpl_create(struct inode *dir, struct dentry *dentry, int mode,
 	vap->va_mask = ATTR_MODE;
 	vap->va_uid = crgetfsuid(cr);
 	vap->va_gid = crgetfsgid(cr);
+	vap->va_dentry = dentry;
 
 	error = -zfs_create(dir, (char *)dentry->d_name.name,
 	    vap, 0, mode, &ip, cr, 0, NULL);
-	if (error)
-		goto out;
-
-	d_instantiate(dentry, ip);
-out:
 	kmem_free(vap, sizeof(vattr_t));
 	crfree(cr);
 	ASSERT3S(error, <=, 0);
@@ -96,14 +92,10 @@ zpl_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
 	vap->va_rdev = rdev;
 	vap->va_uid = crgetfsuid(cr);
 	vap->va_gid = crgetfsgid(cr);
+	vap->va_dentry = dentry;
 
 	error = -zfs_create(dir, (char *)dentry->d_name.name,
 	    vap, 0, mode, &ip, cr, 0, NULL);
-	if (error)
-		goto out;
-
-	d_instantiate(dentry, ip);
-out:
 	kmem_free(vap, sizeof(vattr_t));
 	crfree(cr);
 	ASSERT3S(error, <=, 0);
@@ -139,13 +131,9 @@ zpl_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 	vap->va_mask = ATTR_MODE;
 	vap->va_uid = crgetfsuid(cr);
 	vap->va_gid = crgetfsgid(cr);
+	vap->va_dentry = dentry;
 
 	error = -zfs_mkdir(dir, dname(dentry), vap, &ip, cr, 0, NULL);
-	if (error)
-		goto out;
-
-	d_instantiate(dentry, ip);
-out:
 	kmem_free(vap, sizeof(vattr_t));
 	crfree(cr);
 	ASSERT3S(error, <=, 0);
@@ -264,13 +252,9 @@ zpl_symlink(struct inode *dir, struct dentry *dentry, const char *name)
 	vap->va_mask = ATTR_MODE;
 	vap->va_uid = crgetfsuid(cr);
 	vap->va_gid = crgetfsgid(cr);
+	vap->va_dentry = dentry;
 
 	error = -zfs_symlink(dir, dname(dentry), vap, (char *)name, &ip, cr, 0);
-	if (error)
-		goto out;
-
-	d_instantiate(dentry, ip);
-out:
 	kmem_free(vap, sizeof(vattr_t));
 	crfree(cr);
 	ASSERT3S(error, <=, 0);