Skip to content

Commit

Permalink
Apply the ZoL coding standard to zpl_xattr.c
Browse files Browse the repository at this point in the history
Make the indenting in the zpl_xattr.c file consistent with the Sun
coding standard by removing soft tabs.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
  • Loading branch information
dajhorn authored and behlendorf committed Jan 12, 2012
1 parent 166dd49 commit 96b91ef
Showing 1 changed file with 16 additions and 17 deletions.
33 changes: 16 additions & 17 deletions module/zfs/zpl_xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ __zpl_xattr_security_init(struct inode *ip, const struct xattr *xattrs,
break;
}

return (error);
return (error);
}

int
Expand All @@ -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 */

Expand All @@ -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 */
};

0 comments on commit 96b91ef

Please sign in to comment.