netfilter: nf_tables: relocate header content to consumer (f1f86d09) · Commits · 戴 / test

The nf_tables.h header is used in a lot of files, but it turns out that there is only one actual user of nft_expr_clone(). Hence we relocate that function to be with the one consumer of it and avoid having to process it with CPP for all the other files. This will also enable a reduction in the other headers that the nf_tables.h itself has to include just to be stand-alone, hence a pending further significant reduction in the CPP content that needs to get processed for each netfilter file. Note that the explicit "inline" has been dropped as part of this relocation. In similar changes to this, I believe Dave has asked this be done, so we free up gcc to make the choice of whether to inline or not. Signed-off-by:

Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by:

Pablo Neira Ayuso <pablo@netfilter.org>

include/net/netfilter/nf_tables.h

+0 −17

Original line number	Diff line number	Diff line
		@@ -806,23 +806,6 @@ void nft_expr_destroy(const struct nft_ctx ctx, struct nft_expr expr);
		int nft_expr_dump(struct sk_buff *skb, unsigned int attr,
		const struct nft_expr *expr);

		static inline int nft_expr_clone(struct nft_expr dst, struct nft_expr src)
		{
		int err;

		if (src->ops->clone) {
		dst->ops = src->ops;
		err = src->ops->clone(dst, src);
		if (err < 0)
		return err;
		} else {
		memcpy(dst, src, src->ops->size);
		}

		__module_get(src->ops->type->owner);
		return 0;
		}

		/**
		* struct nft_rule - nf_tables rule
		*

net/netfilter/nft_dynset.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,23 @@ struct nft_dynset {
		struct nft_set_binding binding;
		};

		static int nft_expr_clone(struct nft_expr dst, struct nft_expr src)
		{
		int err;

		if (src->ops->clone) {
		dst->ops = src->ops;
		err = src->ops->clone(dst, src);
		if (err < 0)
		return err;
		} else {
		memcpy(dst, src, src->ops->size);
		}

		__module_get(src->ops->type->owner);
		return 0;
		}

		static void nft_dynset_new(struct nft_set set, const struct nft_expr *expr,
		struct nft_regs *regs)
		{

Admin message