X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzpl_inode.c;h=6175c2e93f8e4c2fe168f86a651a6764b3f8fc57;hb=e89260a1c8851ce05ea04b23606ba438b271d890;hp=5b31c126cd4ae42b695c9fa715e49b1fb424605d;hpb=8f195a908ffaa8faf8f4c8a0e701e44ae3859e33;p=zfs.git

diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
index 5b31c12..6175c2e 100644
--- a/module/zfs/zpl_inode.c
+++ b/module/zfs/zpl_inode.c
@@ -75,8 +75,13 @@ zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry,
 }
 
 static int
+#ifdef HAVE_CREATE_NAMEIDATA
 zpl_create(struct inode *dir, struct dentry *dentry, zpl_umode_t mode,
     struct nameidata *nd)
+#else
+zpl_create(struct inode *dir, struct dentry *dentry, zpl_umode_t mode,
+    bool flag)
+#endif
 {
 	cred_t *cr = CRED();
 	struct inode *ip;
@@ -87,8 +92,12 @@ zpl_create(struct inode *dir, struct dentry *dentry, zpl_umode_t mode,
 	vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
 	zpl_vap_init(vap, dir, dentry, mode, cr);
 
-	error = -zfs_create(dir, (char *)dentry->d_name.name,
-	    vap, 0, mode, &ip, cr, 0, NULL);
+	error = -zfs_create(dir, dname(dentry), vap, 0, mode, &ip, cr, 0, NULL);
+	if (error == 0) {
+		error = zpl_xattr_security_init(ip, dir, &dentry->d_name);
+		VERIFY3S(error, ==, 0);
+	}
+
 	kmem_free(vap, sizeof(vattr_t));
 	crfree(cr);
 	ASSERT3S(error, <=, 0);