diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-12-26 08:07:31 +0300 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-12-26 08:07:31 +0300 |
| commit | 37babe4ec610ff288a60aa79619b3d2f00bcfd89 (patch) | |
| tree | a3f76e129675a77c560f118e0b12f525fb06f144 /security/smack | |
| parent | 3cb92fe48138d225b8d0ceedf148642f9103f841 (diff) | |
| parent | 76319946f321e30872dd72af7de867cb26e7a373 (diff) | |
| download | linux-37babe4ec610ff288a60aa79619b3d2f00bcfd89.tar.xz | |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/smack')
| -rw-r--r-- | security/smack/smack_lsm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index ff81026f6ddb..ac7436f1bc2b 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -1465,7 +1465,7 @@ static int smack_inode_removexattr(struct dentry *dentry, const char *name) * * Returns the size of the attribute or an error code */ -static int smack_inode_getsecurity(const struct inode *inode, +static int smack_inode_getsecurity(struct inode *inode, const char *name, void **buffer, bool alloc) { @@ -1538,7 +1538,7 @@ static int smack_inode_listsecurity(struct inode *inode, char *buffer, * @inode: inode to extract the info from * @secid: where result will be saved */ -static void smack_inode_getsecid(const struct inode *inode, u32 *secid) +static void smack_inode_getsecid(struct inode *inode, u32 *secid) { struct inode_smack *isp = inode->i_security; |