diff options
| author | NeilBrown <neilb@suse.com> | 2017-04-10 12:08:53 +1000 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2017-04-28 07:56:33 -0500 |
| commit | a6f74e80f271b19ea709cbda55e8eb67e9ffccf2 (patch) | |
| tree | 8ceb1cee86f26fb69c14d4d9e5d2478359f546e2 /fs/cifs/misc.c | |
| parent | 7d0c234fd2e1c9ca3fa032696c0c58b1b74a9e0b (diff) | |
| download | linux-a6f74e80f271b19ea709cbda55e8eb67e9ffccf2.tar.gz linux-a6f74e80f271b19ea709cbda55e8eb67e9ffccf2.tar.bz2 linux-a6f74e80f271b19ea709cbda55e8eb67e9ffccf2.zip | |
cifs: don't check for failure from mempool_alloc()
mempool_alloc() cannot fail if the gfp flags allow it to
sleep, and both GFP_FS allows for sleeping.
So these tests of the return value from mempool_alloc()
cannot be needed.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/misc.c')
| -rw-r--r-- | fs/cifs/misc.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index d3fb11529ed9..843787850435 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c @@ -167,13 +167,11 @@ cifs_buf_get(void) /* clear the first few header bytes */ /* for most paths, more is cleared in header_assemble */ - if (ret_buf) { - memset(ret_buf, 0, buf_size + 3); - atomic_inc(&bufAllocCount); + memset(ret_buf, 0, buf_size + 3); + atomic_inc(&bufAllocCount); #ifdef CONFIG_CIFS_STATS2 - atomic_inc(&totBufAllocCount); + atomic_inc(&totBufAllocCount); #endif /* CONFIG_CIFS_STATS2 */ - } return ret_buf; } @@ -201,15 +199,13 @@ cifs_small_buf_get(void) albeit slightly larger than necessary and maxbuffersize defaults to this and can not be bigger */ ret_buf = mempool_alloc(cifs_sm_req_poolp, GFP_NOFS); - if (ret_buf) { /* No need to clear memory here, cleared in header assemble */ /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/ - atomic_inc(&smBufAllocCount); + atomic_inc(&smBufAllocCount); #ifdef CONFIG_CIFS_STATS2 - atomic_inc(&totSmBufAllocCount); + atomic_inc(&totSmBufAllocCount); #endif /* CONFIG_CIFS_STATS2 */ - } return ret_buf; } |