Commit fee5304a authored by Xiu Jianfeng's avatar Xiu Jianfeng Committed by John Johansen
Browse files

apparmor: remove unused functions in policy_ns.c/.h 



These functions are not used now, remove them.

Signed-off-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent 5ebb39eb

security/apparmor/include/policy_ns.h

+0 −14
Original line number Diff line number Diff line
@@ -86,10 +86,7 @@ const char *aa_ns_name(struct aa_ns *parent, struct aa_ns *child, bool subns); 
void aa_free_ns(struct aa_ns *ns);

int aa_alloc_root_ns(void);

void aa_free_root_ns(void);

void aa_free_ns_kref(struct kref *kref);



struct aa_ns *aa_find_ns(struct aa_ns *root, const char *name);

struct aa_ns *aa_findn_ns(struct aa_ns *root, const char *name, size_t n);

struct aa_ns *__aa_lookupn_ns(struct aa_ns *view, const char *hname, size_t n);

struct aa_ns *aa_lookupn_ns(struct aa_ns *view, const char *name, size_t n);

struct aa_ns *__aa_find_or_create_ns(struct aa_ns *parent, const char *name,
@@ -151,15 +148,4 @@ static inline struct aa_ns *__aa_find_ns(struct list_head *head, 
	return __aa_findn_ns(head, name, strlen(name));

}



static inline struct aa_ns *__aa_lookup_ns(struct aa_ns *base,

					   const char *hname)

{

	return __aa_lookupn_ns(base, hname, strlen(hname));

}



static inline struct aa_ns *aa_lookup_ns(struct aa_ns *view, const char *name)

{

	return aa_lookupn_ns(view, name, strlen(name));

}



#endif /* AA_NAMESPACE_H */

security/apparmor/policy_ns.c

+0 −37
Original line number Diff line number Diff line
@@ -159,43 +159,6 @@ void aa_free_ns(struct aa_ns *ns) 
	kfree_sensitive(ns);

}



/**

 * aa_findn_ns  -  look up a profile namespace on the namespace list

 * @root: namespace to search in  (NOT NULL)

 * @name: name of namespace to find  (NOT NULL)

 * @n: length of @name

 *

 * Returns: a refcounted namespace on the list, or NULL if no namespace

 *          called @name exists.

 *

 * refcount released by caller

 */

struct aa_ns *aa_findn_ns(struct aa_ns *root, const char *name, size_t n)

{

	struct aa_ns *ns = NULL;



	rcu_read_lock();

	ns = aa_get_ns(__aa_findn_ns(&root->sub_ns, name, n));

	rcu_read_unlock();



	return ns;

}



/**

 * aa_find_ns  -  look up a profile namespace on the namespace list

 * @root: namespace to search in  (NOT NULL)

 * @name: name of namespace to find  (NOT NULL)

 *

 * Returns: a refcounted namespace on the list, or NULL if no namespace

 *          called @name exists.

 *

 * refcount released by caller

 */

struct aa_ns *aa_find_ns(struct aa_ns *root, const char *name)

{

	return aa_findn_ns(root, name, strlen(name));

}



/**

 * __aa_lookupn_ns - lookup the namespace matching @hname

 * @view: namespace to search in  (NOT NULL)