X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=module%2Fzfs%2Fzpl_inode.c;h=6175c2e93f8e4c2fe168f86a651a6764b3f8fc57;hb=e89260a1c8851ce05ea04b23606ba438b271d890;hp=ea8c309ac48c11a1516d9bec4a0d5585b86b3fc7;hpb=0a6b03d3b87cf17ac6159395df93ba3fcfdddc45;p=zfs.git

diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
index ea8c309..6175c2e 100644
--- a/module/zfs/zpl_inode.c
+++ b/module/zfs/zpl_inode.c
@@ -31,7 +31,11 @@
 
 
 static struct dentry *
+#ifdef HAVE_LOOKUP_NAMEIDATA
 zpl_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
+#else
+zpl_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
+#endif
 {
 	cred_t *cr = CRED();
 	struct inode *ip;
@@ -71,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;
@@ -83,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);
@@ -328,6 +341,7 @@ out:
 	return (error);
 }
 
+#ifdef HAVE_INODE_TRUNCATE_RANGE
 static void
 zpl_truncate_range(struct inode* ip, loff_t start, loff_t end)
 {
@@ -354,6 +368,7 @@ zpl_truncate_range(struct inode* ip, loff_t start, loff_t end)
 
 	crfree(cr);
 }
+#endif /* HAVE_INODE_TRUNCATE_RANGE */
 
 #ifdef HAVE_INODE_FALLOCATE
 static long
@@ -379,7 +394,9 @@ const struct inode_operations zpl_inode_operations = {
 	.getxattr	= generic_getxattr,
 	.removexattr	= generic_removexattr,
 	.listxattr	= zpl_xattr_list,
+#ifdef HAVE_INODE_TRUNCATE_RANGE
 	.truncate_range = zpl_truncate_range,
+#endif /* HAVE_INODE_TRUNCATE_RANGE */
 #ifdef HAVE_INODE_FALLOCATE
 	.fallocate	= zpl_fallocate,
 #endif /* HAVE_INODE_FALLOCATE */