korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 05:04:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

flowcache: more "unsigned int"

Browse Source 
Make ->hash_count, ->low_watermark and ->high_watermark unsigned int
and propagate unsignedness to other variables.

This change doesn't change code generation because these fields aren't
used in 64-bit contexts but make it anyway: these fields can't be
negative numbers.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexey Dobriyan 2017-04-03 00:53:15 +03:00 committed by David S. Miller
parent f31cc7e815
commit ec2e45a978
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/flowcache.h
View File

@ -8,7 +8,7 @@
struct flow_cache_percpu { struct flow_cache_percpu {
struct hlist_head *hash_table; struct hlist_head *hash_table;
int hash_count; unsigned int hash_count;
u32 hash_rnd; u32 hash_rnd;
int hash_rnd_recalc; int hash_rnd_recalc;
struct tasklet_struct flush_tasklet; struct tasklet_struct flush_tasklet;
@ -18,8 +18,8 @@ struct flow_cache {
u32 hash_shift; u32 hash_shift;
struct flow_cache_percpu __percpu *percpu; struct flow_cache_percpu __percpu *percpu;
struct hlist_node node; struct hlist_node node;
int low_watermark; unsigned int low_watermark;
int high_watermark; unsigned int high_watermark;
struct timer_list rnd_timer; struct timer_list rnd_timer;
}; };
#endif /* _NET_FLOWCACHE_H */ #endif /* _NET_FLOWCACHE_H */

13
net/core/flow.c
View File

@ -99,7 +99,8 @@ static void flow_cache_gc_task(struct work_struct *work)
} }
static void flow_cache_queue_garbage(struct flow_cache_percpu *fcp, static void flow_cache_queue_garbage(struct flow_cache_percpu *fcp,
int deleted, struct list_head *gc_list, unsigned int deleted,
struct list_head *gc_list,
struct netns_xfrm *xfrm) struct netns_xfrm *xfrm)
{ {
if (deleted) { if (deleted) {
@ -114,18 +115,18 @@ static void flow_cache_queue_garbage(struct flow_cache_percpu *fcp,
static void __flow_cache_shrink(struct flow_cache *fc, static void __flow_cache_shrink(struct flow_cache *fc,
struct flow_cache_percpu *fcp, struct flow_cache_percpu *fcp,
int shrink_to) unsigned int shrink_to)
{ {
struct flow_cache_entry *fle; struct flow_cache_entry *fle;
struct hlist_node *tmp; struct hlist_node *tmp;
LIST_HEAD(gc_list); LIST_HEAD(gc_list);
int deleted = 0; unsigned int deleted = 0;
struct netns_xfrm *xfrm = container_of(fc, struct netns_xfrm, struct netns_xfrm *xfrm = container_of(fc, struct netns_xfrm,
flow_cache_global); flow_cache_global);
unsigned int i; unsigned int i;
for (i = 0; i < flow_cache_hash_size(fc); i++) { for (i = 0; i < flow_cache_hash_size(fc); i++) {
int saved = 0; unsigned int saved = 0;
hlist_for_each_entry_safe(fle, tmp, hlist_for_each_entry_safe(fle, tmp,
&fcp->hash_table[i], u.hlist) { &fcp->hash_table[i], u.hlist) {
@ -146,7 +147,7 @@ static void __flow_cache_shrink(struct flow_cache *fc,
static void flow_cache_shrink(struct flow_cache *fc, static void flow_cache_shrink(struct flow_cache *fc,
struct flow_cache_percpu *fcp) struct flow_cache_percpu *fcp)
{ {
int shrink_to = fc->low_watermark / flow_cache_hash_size(fc); unsigned int shrink_to = fc->low_watermark / flow_cache_hash_size(fc);
__flow_cache_shrink(fc, fcp, shrink_to); __flow_cache_shrink(fc, fcp, shrink_to);
} }
@ -296,7 +297,7 @@ static void flow_cache_flush_tasklet(unsigned long data)
struct flow_cache_entry *fle; struct flow_cache_entry *fle;
struct hlist_node *tmp; struct hlist_node *tmp;
LIST_HEAD(gc_list); LIST_HEAD(gc_list);
int deleted = 0; unsigned int deleted = 0;
struct netns_xfrm *xfrm = container_of(fc, struct netns_xfrm, struct netns_xfrm *xfrm = container_of(fc, struct netns_xfrm,
flow_cache_global); flow_cache_global);
unsigned int i; unsigned int i;