aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarik Horn <[email protected]>2012-01-05 14:27:36 -0600
committerBrian Behlendorf <[email protected]>2012-01-12 15:12:03 -0800
commit96b91ef0d6b289037c4d54357901e4b694e08f02 (patch)
tree8496c24e1c64b11ca5c2a4703921a7f54f5e88c4
parent166dd49de0272e6f179e5fd6a41eebb4880a1154 (diff)
Apply the ZoL coding standard to zpl_xattr.c
Make the indenting in the zpl_xattr.c file consistent with the Sun coding standard by removing soft tabs. Signed-off-by: Brian Behlendorf <[email protected]>
-rw-r--r--module/zfs/zpl_xattr.c33
1 files changed, 16 insertions, 17 deletions
diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c
index 51c81ed0c..dbe61df98 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,6 @@ 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 */
};