[PATCH] [NETLABEL] Minor cleanup: remove unused method definition

[PATCH] [NETLABEL] Minor cleanup: remove unused method definition

[Rami Rosen]

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

Hi,

This patch removes definition of netlbl_cfg_cipsov4_del() method in
netlabel/netlabel_kapi.c and in include/net/netlabel.h as it is not used.


Regards,
Rami Rosen


Signed-off-by: Rami Rosen <ramirose@gmail.com>

[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 1608 bytes --]

diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index 0ca67d7..911d8c6 100644
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -350,7 +350,6 @@ int netlbl_cfg_cipsov4_add(struct cipso_v4_doi *doi_def,
 int netlbl_cfg_cipsov4_add_map(struct cipso_v4_doi *doi_def,
 			       const char *domain,
 			       struct netlbl_audit *audit_info);
-int netlbl_cfg_cipsov4_del(u32 doi, struct netlbl_audit *audit_info);
 
 /*
  * LSM security attribute operations
@@ -408,11 +407,6 @@ static inline int netlbl_cfg_cipsov4_add_map(struct cipso_v4_doi *doi_def,
 {
 	return -ENOSYS;
 }
-static inline int netlbl_cfg_cipsov4_del(u32 doi,
-					 struct netlbl_audit *audit_info)
-{
-	return -ENOSYS;
-}
 static inline int netlbl_secattr_catmap_walk(
 	                              struct netlbl_lsm_secattr_catmap *catmap,
 				      u32 offset)
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 39793a1..02b268d 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -203,21 +203,6 @@ cfg_cipsov4_add_map_failure:
 	return ret_val;
 }
 
-/**
- * netlbl_cfg_cipsov4_del - Removean existing CIPSOv4 DOI definition
- * @doi: the CIPSO DOI value
- * @audit_info: NetLabel audit information
- *
- * Description:
- * Removes an existing CIPSOv4 DOI definition from the NetLabel subsystem.
- * Returns zero on success, negative values on failure.
- *
- */
-int netlbl_cfg_cipsov4_del(u32 doi, struct netlbl_audit *audit_info)
-{
-	return cipso_v4_doi_remove(doi, audit_info, netlbl_cipsov4_doi_free);
-}
-
 /*
  * Security Attribute Functions
  */

Re: [PATCH] [NETLABEL] Minor cleanup: remove unused method definition

[Paul Moore]

On Tuesday 19 February 2008 9:25:31 am Rami Rosen wrote:
> Hi,
>
> This patch removes definition of netlbl_cfg_cipsov4_del() method in
> netlabel/netlabel_kapi.c and in include/net/netlabel.h as it is not
> used.
>
>
> Regards,
> Rami Rosen
>
>
> Signed-off-by: Rami Rosen <ramirose@gmail.com>

This was added for use by Smack (and any other LSMs which want to 
configure NetLabel directly) and since this is an area that is 
undergoing a lot of churn at this point I'd prefer if this function was 
left in place for the time being.

At a later date if this function is still unused, I'll gladly ack it's 
removal or do so myself.

-- 
paul moore
linux security @ hp

Re: [PATCH] [NETLABEL] Minor cleanup: remove unused method definition

[David Miller]

From: Paul Moore <paul.moore@hp.com>
Date: Tue, 19 Feb 2008 11:08:27 -0500

> On Tuesday 19 February 2008 9:25:31 am Rami Rosen wrote:
> > Hi,
> >
> > This patch removes definition of netlbl_cfg_cipsov4_del() method in
> > netlabel/netlabel_kapi.c and in include/net/netlabel.h as it is not
> > used.
> >
> >
> > Regards,
> > Rami Rosen
> >
> >
> > Signed-off-by: Rami Rosen <ramirose@gmail.com>
> 
> This was added for use by Smack (and any other LSMs which want to 
> configure NetLabel directly) and since this is an area that is 
> undergoing a lot of churn at this point I'd prefer if this function was 
> left in place for the time being.
> 
> At a later date if this function is still unused, I'll gladly ack it's 
> removal or do so myself.

Ok, let's leave it in for now.