X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzpl_inode.c;h=8376673f15f51704904f6dfef77162ab8892252c;hb=c8082367cfe9954f0e932fb1513b518d8b84022d;hp=fcc19b00436699d892c877d9f741b123e9f63ef0;hpb=81e97e21872a9c38ad66c37fafe1436ee25abee3;p=zfs.git

diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
index fcc19b0..8376673 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);
@@ -89,6 +85,13 @@ zpl_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
 	vattr_t *vap;
 	int error;
 
+	/*
+	 * We currently expect Linux to supply rdev=0 for all sockets
+	 * and fifos, but we want to know if this behavior ever changes.
+	 */
+	if (S_ISSOCK(mode) || S_ISFIFO(mode))
+		ASSERT(rdev == 0);
+
 	crhold(cr);
 	vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
 	vap->va_mode = mode;
@@ -96,14 +99,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 +138,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 +259,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);