X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzpl_xattr.c;h=c03764fc507fdb8a328ebad5bb4d657312a5e95e;hb=1c24b699b0c7590e135f4701b50a4c933ebe0499;hp=51c81ed0c97d7003f2971aae979b75b6573c6ef2;hpb=166dd49de0272e6f179e5fd6a41eebb4880a1154;p=zfs.git

diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c
index 51c81ed..c03764f 100644
--- a/module/zfs/zpl_xattr.c
+++ b/module/zfs/zpl_xattr.c
@@ -622,7 +622,7 @@ __zpl_xattr_security_init(struct inode *ip, const struct xattr *xattrs,
 			break;
 	}
 
-        return (error);
+	return (error);
 }
 
 int
@@ -638,26 +638,25 @@ int
 zpl_xattr_security_init(struct inode *ip, struct inode *dip,
     const struct qstr *qstr)
 {
-        int error;
-        size_t len;
-        void *value;
-        char *name;
-
-        error = zpl_security_inode_init_security(ip, dip, qstr,
-	    &name, &value, &len);
-        if (error) {
-                if (error == -EOPNOTSUPP)
-                        return 0;
+	int error;
+	size_t len;
+	void *value;
+	char *name;
 
-                return (error);
-        }
+	error = zpl_security_inode_init_security(ip, dip, qstr,
+	  &name, &value, &len);
+	if (error) {
+		if (error == -EOPNOTSUPP)
+			return 0;
+		return (error);
+	}
 
 	error = __zpl_xattr_security_set(ip, name, value, len, 0);
 
-        kfree(name);
-        kfree(value);
+	kfree(name);
+	kfree(value);
 
-        return (error);
+	return (error);
 }
 #endif /* HAVE_CALLBACK_SECURITY_INODE_INIT_SECURITY */
 
@@ -673,6 +672,7 @@ xattr_handler_t *zpl_xattr_handlers[] = {
 	&zpl_xattr_user_handler,
 #ifdef HAVE_POSIX_ACLS
 	&zpl_xattr_acl_access_handler,
-        &zpl_xattr_acl_default_handler,
+	&zpl_xattr_acl_default_handler,
 #endif /* HAVE_POSIX_ACLS */
+	NULL
 };