Commit 668959a5 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: turn ceph_security_invalidate_secctx into static inline 



No need to do an extra jump here. Also add some comments on the endifs.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 321fe13c

fs/ceph/super.h

+5 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/posix_acl.h>

#include <linux/posix_acl.h>

#include <linux/refcount.h>

#include <linux/refcount.h>

#include <linux/security.h>





#include <linux/ceph/libceph.h>

#include <linux/ceph/libceph.h>
@@ -971,7 +972,10 @@ static inline bool ceph_security_xattr_wanted(struct inode *in) 
#ifdef CONFIG_CEPH_FS_SECURITY_LABEL

#ifdef CONFIG_CEPH_FS_SECURITY_LABEL

extern int ceph_security_init_secctx(struct dentry *dentry, umode_t mode,

extern int ceph_security_init_secctx(struct dentry *dentry, umode_t mode,

				     struct ceph_acl_sec_ctx *ctx);

				     struct ceph_acl_sec_ctx *ctx);

extern void ceph_security_invalidate_secctx(struct inode *inode);

static inline void ceph_security_invalidate_secctx(struct inode *inode)

{

	security_inode_invalidate_secctx(inode);

}

#else

#else

static inline int ceph_security_init_secctx(struct dentry *dentry, umode_t mode,

static inline int ceph_security_init_secctx(struct dentry *dentry, umode_t mode,

					    struct ceph_acl_sec_ctx *ctx)

					    struct ceph_acl_sec_ctx *ctx)

fs/ceph/xattr.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -1265,11 +1265,6 @@ int ceph_security_init_secctx(struct dentry *dentry, umode_t mode, 
	return err;

	return err;

}

}





void ceph_security_invalidate_secctx(struct inode *inode)

{

	security_inode_invalidate_secctx(inode);

}



static int ceph_xattr_set_security_label(const struct xattr_handler *handler,

static int ceph_xattr_set_security_label(const struct xattr_handler *handler,

				    struct dentry *unused, struct inode *inode,

				    struct dentry *unused, struct inode *inode,

				    const char *key, const void *buf,

				    const char *key, const void *buf,
@@ -1298,8 +1293,8 @@ static const struct xattr_handler ceph_security_label_handler = { 
	.get    = ceph_xattr_get_security_label,

	.get    = ceph_xattr_get_security_label,

	.set    = ceph_xattr_set_security_label,

	.set    = ceph_xattr_set_security_label,

};

};

#endif

#endif /* CONFIG_CEPH_FS_SECURITY_LABEL */

#endif

#endif /* CONFIG_SECURITY */





void ceph_release_acl_sec_ctx(struct ceph_acl_sec_ctx *as_ctx)

void ceph_release_acl_sec_ctx(struct ceph_acl_sec_ctx *as_ctx)

{

{