From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Westphal Subject: Re: [PATCH ghak25 v2 2/9] netfilter: normalize ebtables function declarations Date: Mon, 6 Jan 2020 21:30:44 +0100 Message-ID: <20200106203044.GQ795@breakpoint.cc> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Richard Guy Briggs Cc: Linux-Audit Mailing List , LKML , netfilter-devel@vger.kernel.org, Paul Moore , sgrubb@redhat.com, omosnace@redhat.com, fw@strlen.de, twoerner@redhat.com, eparis@parisplace.org, ebiederm@xmission.com, tgraf@infradead.org List-Id: linux-audit@redhat.com Richard Guy Briggs wrote: > Git context diffs were being produced with unhelpful declaration types > in the place of function names to help identify the funciton in which > changes were made. > > Normalize ebtables function declarations so that git context diff > function labels work as expected. > > Signed-off-by: Richard Guy Briggs I suggest that you also drop the inline keyword for all functions that are called from control path, for example > -static inline void * > -find_inlist_lock_noload(struct list_head *head, const char *name, int *error, > - struct mutex *mutex) > +static inline void *find_inlist_lock_noload(struct list_head *head, > + const char *name, int *error, > + struct mutex *mutex) > -static inline struct ebt_table * > -find_table_lock(struct net *net, const char *name, int *error, > - struct mutex *mutex) > +static inline struct ebt_table *find_table_lock(struct net *net, > -static inline int > -ebt_check_match(struct ebt_entry_match *m, struct xt_mtchk_param *par, > - unsigned int *cnt) > + > +static inline int ebt_check_match(struct ebt_entry_match *m, > -static inline int > -ebt_check_watcher(struct ebt_entry_watcher *w, struct xt_tgchk_param *par, > - unsigned int *cnt) > -static inline int > -ebt_check_entry_size_and_hooks(const struct ebt_entry *e, > -static inline int > -ebt_get_udc_positions(struct ebt_entry *e, struct ebt_table_info *newinfo, > - unsigned int *n, struct ebt_cl_stack *udc) > -static inline int > -ebt_cleanup_match(struct ebt_entry_match *m, struct net *net, unsigned int *i) > -static inline int > -ebt_cleanup_watcher(struct ebt_entry_watcher *w, struct net *net, unsigned int *i) > -static inline int > -ebt_cleanup_entry(struct ebt_entry *e, struct net *net, unsigned int *cnt) > -static inline int > -ebt_check_entry(struct ebt_entry *e, struct net *net, > - const struct ebt_table_info *newinfo, > - const char *name, unsigned int *cnt, > - struct ebt_cl_stack *cl_s, unsigned int udc_cnt) .. can all have 'inline' removed. Other than that this looks good to me.