X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzpl_xattr.c;h=cf52e720d96468050c5ec957919f739c960e3d8c;hb=e45aa452988f721e458fa3abe54669bdf9377352;hp=bb93414221b5a209ea89c131916bd36deb32fe37;hpb=bec30953cdbbb03d2a3791bd1ffe5b062bad0ec3;p=zfs.git

diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c
index bb93414..cf52e72 100644
--- a/module/zfs/zpl_xattr.c
+++ b/module/zfs/zpl_xattr.c
@@ -83,7 +83,7 @@ zpl_xattr_filldir(void *arg, const char *name, int name_len,
 	xattr_filldir_t *xf = arg;
 
 	if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN))
-		if (!(ITOZSB(xf->inode)->z_flags & ZSB_XATTR_USER))
+		if (!(ITOZSB(xf->inode)->z_flags & ZSB_XATTR))
 			return (0);
 
 	if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN))
@@ -281,7 +281,7 @@ __zpl_xattr_user_get(struct inode *ip, const char *name,
 	if (strcmp(name, "") == 0)
 		return -EINVAL;
 
-	if (!(ITOZSB(ip)->z_flags & ZSB_XATTR_USER))
+	if (!(ITOZSB(ip)->z_flags & ZSB_XATTR))
 		return -EOPNOTSUPP;
 
 	xattr_name = kmem_asprintf("%s%s", XATTR_USER_PREFIX, name);
@@ -302,7 +302,7 @@ __zpl_xattr_user_set(struct inode *ip, const char *name,
 	if (strcmp(name, "") == 0)
 		return -EINVAL;
 
-	if (!(ITOZSB(ip)->z_flags & ZSB_XATTR_USER))
+	if (!(ITOZSB(ip)->z_flags & ZSB_XATTR))
 		return -EOPNOTSUPP;
 
 	xattr_name = kmem_asprintf("%s%s", XATTR_USER_PREFIX, name);
@@ -404,14 +404,16 @@ __zpl_xattr_security_set(struct inode *ip, const char *name,
 ZPL_XATTR_SET_WRAPPER(zpl_xattr_security_set);
 
 int
-zpl_xattr_security_init(struct inode *ip, struct inode *dip)
+zpl_xattr_security_init(struct inode *ip, struct inode *dip,
+    const struct qstr *qstr)
 {
         int error;
         size_t len;
         void *value;
         char *name;
 
-        error = security_inode_init_security(ip, dip, &name, &value, &len);
+        error = zpl_security_inode_init_security(ip, dip, qstr,
+	    &name, &value, &len);
         if (error) {
                 if (error == -EOPNOTSUPP)
                         return 0;