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 /drivers/scsi/cxgbi | |
| parent | 85dbe706074c8b9091a3bc5f24eff02a044701c3 (diff) | |
| download | linux-8be04b9374e59923fa337766aaa74151b95b7099.tar.bz2 | |
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 'drivers/scsi/cxgbi')
| -rw-r--r-- | drivers/scsi/cxgbi/libcxgbi.h | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/drivers/scsi/cxgbi/libcxgbi.h b/drivers/scsi/cxgbi/libcxgbi.h index 80fa99b3d384..8135f04671af 100644 --- 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;  } |