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>

diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index 64fbb8385cdc87575ce499d888919ac3cb52b81e..b12c11ec4bd21e405fe75276d656e3519c8ad873 100644 (file)
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -393,7 +393,7 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want)
         * we must not block on IO to ourselves.
         * Context is receiver thread or dmsetup. */
        bytes = sizeof(struct page *)*want;
-       new_pages = kzalloc(bytes, GFP_NOIO);
+       new_pages = kzalloc(bytes, GFP_NOIO | __GFP_NOWARN);
        if (!new_pages) {
                new_pages = __vmalloc(bytes,
                                GFP_NOIO | __GFP_HIGHMEM | __GFP_ZERO,

diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
index 62c71fadb4d97d10a29f0e05452b63f888fb0814..8d594517cd292821182e0dc363a32ea0f6d98c9f 100644 (file)
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
@@ -222,7 +222,8 @@ int ipz_queue_ctor(struct ehca_pd *pd, struct ipz_queue *queue,
        queue->small_page = NULL;
 
        /* allocate queue page pointers */
-       queue->queue_pages = kzalloc(nr_of_pages * sizeof(void *), GFP_KERNEL);
+       queue->queue_pages = kzalloc(nr_of_pages * sizeof(void *),
+                                    GFP_KERNEL | __GFP_NOWARN);
        if (!queue->queue_pages) {
                queue->queue_pages = vzalloc(nr_of_pages * sizeof(void *));
                if (!queue->queue_pages) {

diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
index 4058b856eb710779bf7f164ed1547749f6a26b94..76ae09999b5b86bd15c71da88368eb0a9dea63a7 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
@@ -1157,7 +1157,7 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new,
  */
 void *cxgb_alloc_mem(unsigned long size)
 {
-       void *p = kzalloc(size, GFP_KERNEL);
+       void *p = kzalloc(size, GFP_KERNEL | __GFP_NOWARN);
 
        if (!p)
                p = vzalloc(size);

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 5a3256b083f23f7e69d8013c4ca1ac0585ec33c4..5d5f2685ee2b3b581e5ec49ac7db00f6cef5230e 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -1133,7 +1133,7 @@ out:      release_firmware(fw);
  */
 void *t4_alloc_mem(size_t size)
 {
-       void *p = kzalloc(size, GFP_KERNEL);
+       void *p = kzalloc(size, GFP_KERNEL | __GFP_NOWARN);
 
        if (!p)
                p = vzalloc(size);

diff --git a/drivers/scsi/cxgbi/libcxgbi.h b/drivers/scsi/cxgbi/libcxgbi.h
index 80fa99b3d3842e1d4ac745d1b3602b8bdb5e04c4..8135f04671af3d679400a3d72396aebadd5dc96e 100644 (file)
--- a/drivers/scsi/cxgbi/libcxgbi.h
+++ b/drivers/scsi/cxgbi/libcxgbi.h
@@ -658,11 +658,11 @@ static inline u32 cxgbi_tag_nonrsvd_bits(struct cxgbi_tag_format *tformat,
 static inline void *cxgbi_alloc_big_mem(unsigned int size,
                                        gfp_t gfp)
 {
-       void *p = kmalloc(size, gfp);
+       void *p = kzalloc(size, gfp | __GFP_NOWARN);
+
        if (!p)
-               p = vmalloc(size);
-       if (p)
-               memset(p, 0, size);
+               p = vzalloc(size);
+
        return p;
 }
 

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index d3f3b43cae0bdef23c889f6c5939c49aea13eda6..2e14fd89a8b46e80622168ef30b9ac206b4b6a04 100644 (file)
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -219,7 +219,7 @@ static int fs_path_ensure_buf(struct fs_path *p, int len)
        len = PAGE_ALIGN(len);
 
        if (p->buf == p->inline_buf) {
-               tmp_buf = kmalloc(len, GFP_NOFS);
+               tmp_buf = kmalloc(len, GFP_NOFS | __GFP_NOWARN);
                if (!tmp_buf) {
                        tmp_buf = vmalloc(len);
                        if (!tmp_buf)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index bca26f34edf4ca55dadc3ac9c5447d916dcbe4fa..ffdfe385b029dd3f291ec10b9766f113324e4cdd 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -162,7 +162,7 @@ void *ext4_kvmalloc(size_t size, gfp_t flags)
 {
        void *ret;
 
-       ret = kmalloc(size, flags);
+       ret = kmalloc(size, flags | __GFP_NOWARN);
        if (!ret)
                ret = __vmalloc(size, flags, PAGE_KERNEL);
        return ret;
@@ -172,7 +172,7 @@ void *ext4_kvzalloc(size_t size, gfp_t flags)
 {
        void *ret;
 
-       ret = kzalloc(size, flags);
+       ret = kzalloc(size, flags | __GFP_NOWARN);
        if (!ret)
                ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL);
        return ret;

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 0cb4c1557f20c87a44f74b4ac7d29f9a700de05a..2e5fc268d3242678c8a8e348141679a8fc94b530 100644 (file)
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -1859,7 +1859,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
 
        memset(&rlist, 0, sizeof(struct gfs2_rgrp_list));
 
-       ht = kzalloc(size, GFP_NOFS);
+       ht = kzalloc(size, GFP_NOFS | __GFP_NOWARN);
        if (ht == NULL)
                ht = vzalloc(size);
        if (!ht)

diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index ef53ab8d0aaec69628fe6bf497ced92dd5ebc44c..ddd73cb2d7ba4080f0e8f75ddc715cf9cb2a1587 100644 (file)
--- 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)