From mboxrd@z Thu Jan 1 00:00:00 1970 From: Amy Griffis Subject: [PATCH git] remove inlines in auditfilter.c Date: Mon, 12 Jun 2006 19:25:47 -0400 Message-ID: <20060612232547.GA25974@zk3.dec.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32]) by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k5CNPxqt022639 for ; Mon, 12 Jun 2006 19:25:59 -0400 Received: from tayrelbas01.tay.hp.com (tayrelbas01.tay.hp.com [161.114.80.244]) by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k5CNPrAH009624 for ; Mon, 12 Jun 2006 19:25:53 -0400 Received: from tayrelint01.nz-tay.cpqcorp.net (tayrelint01.nz-tay.cpqcorp.net [16.47.5.6]) by tayrelbas01.tay.hp.com (Postfix) with ESMTP id 853313413C for ; Mon, 12 Jun 2006 19:25:51 -0400 (EDT) Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.96.242]) by tayrelint01.nz-tay.cpqcorp.net (Postfix) with ESMTP id BADFC34003 for ; Mon, 12 Jun 2006 19:25:47 -0400 (EDT) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: linux-audit@redhat.com List-Id: linux-audit@redhat.com I updated gcc on my system and found that manually inlining these functions was increasing the size of auditfilter.o. The exception is audit_dupe_watch(), but that one has the potential for a second callsite in the future. This fix applies to lspp.b19 commit bd5ea49f781e6984c1148fff4d3587eed6cb855e "updated filesystem auditing patches..." Signed-off-by: Amy Griffis --- kernel/auditfilter.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) a0c2e4154a726af0824bdc462423b7f97c944435 diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 30015fd..4c99d2c 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -109,7 +109,7 @@ static inline void audit_get_watch(struc atomic_inc(&watch->count); } -static inline void audit_put_watch(struct audit_watch *watch) +static void audit_put_watch(struct audit_watch *watch) { if (atomic_dec_and_test(&watch->count)) { WARN_ON(watch->parent); @@ -119,7 +119,7 @@ static inline void audit_put_watch(struc } } -static inline void audit_remove_watch(struct audit_watch *watch) +static void audit_remove_watch(struct audit_watch *watch) { list_del(&watch->wlist); put_inotify_watch(&watch->parent->wdata); @@ -151,7 +151,7 @@ static inline void audit_free_rule_rcu(s } /* Initialize a parent watch entry. */ -static inline struct audit_parent *audit_init_parent(struct nameidata *ndp) +static struct audit_parent *audit_init_parent(struct nameidata *ndp) { struct audit_parent *parent; s32 wd; @@ -177,7 +177,7 @@ static inline struct audit_parent *audit } /* Initialize a watch entry. */ -static inline struct audit_watch *audit_init_watch(char *path) +static struct audit_watch *audit_init_watch(char *path) { struct audit_watch *watch; @@ -666,7 +666,7 @@ static int audit_compare_rule(struct aud /* Duplicate the given audit watch. The new watch's rules list is initialized * to an empty list and wlist is undefined. */ -static inline struct audit_watch *audit_dupe_watch(struct audit_watch *old) +static struct audit_watch *audit_dupe_watch(struct audit_watch *old) { char *path; struct audit_watch *new; @@ -776,9 +776,9 @@ static struct audit_entry *audit_dupe_ru } /* Update inode info in audit rules based on filesystem event. */ -static inline void audit_update_watch(struct audit_parent *parent, - const char *dname, dev_t dev, - unsigned long ino, unsigned invalidating) +static void audit_update_watch(struct audit_parent *parent, + const char *dname, dev_t dev, + unsigned long ino, unsigned invalidating) { struct audit_watch *owatch, *nwatch, *nextw; struct audit_krule *r, *nextr; @@ -842,7 +842,7 @@ add_watch_to_parent: } /* Remove all watches & rules associated with a parent that is going away. */ -static inline void audit_remove_parent_watches(struct audit_parent *parent) +static void audit_remove_parent_watches(struct audit_parent *parent) { struct audit_watch *w, *nextw; struct audit_krule *r, *nextr; @@ -948,7 +948,7 @@ static int audit_get_nd(char *path, stru } /* Release resources used for watch path information. */ -static inline void audit_put_nd(struct nameidata *ndp, struct nameidata *ndw) +static void audit_put_nd(struct nameidata *ndp, struct nameidata *ndw) { if (ndp) { path_release(ndp); -- 1.3.0