diff options
| author | Joe Perches <joe@perches.com> | 2013-06-19 12:15:53 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-08-20 13:06:40 +0200 |
| commit | 8be04b9374e59923fa337766aaa74151b95b7099 (patch) | |
| tree | 7491f7f6a9ebeb9f78ed41a94591ffd70e99b870 /net | |
| parent | 85dbe706074c8b9091a3bc5f24eff02a044701c3 (diff) | |
| download | op-kernel-dev-8be04b9374e59923fa337766aaa74151b95b7099.zip op-kernel-dev-8be04b9374e59923fa337766aaa74151b95b7099.tar.gz | |
treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
Don't emit OOM warnings when k.alloc calls fail when
there there is a v.alloc immediately afterwards.
Converted a kmalloc/vmalloc with memset to kzalloc/vzalloc.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/sch_choke.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c index ef53ab8..ddd73cb 100644 --- a/net/sched/sch_choke.c +++ b/net/sched/sch_choke.c @@ -438,7 +438,8 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt) if (mask != q->tab_mask) { struct sk_buff **ntab; - ntab = kcalloc(mask + 1, sizeof(struct sk_buff *), GFP_KERNEL); + ntab = kcalloc(mask + 1, sizeof(struct sk_buff *), + GFP_KERNEL | __GFP_NOWARN); if (!ntab) ntab = vzalloc((mask + 1) * sizeof(struct sk_buff *)); if (!ntab) |
