diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2019-07-16 19:28:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-16 22:23:23 -0400 |
commit | 4dc48193d748f0f0fbe37105a905466ff3a6ad50 (patch) | |
tree | 7547b1eff27892eef20e113d72ac5a7b4032ea40 /fs/coda/upcall.c | |
parent | 5e7c31dfe74703f428220384b2863525957cc160 (diff) |
coda: get rid of CODA_ALLOC()
These days we have kvzalloc() so we can delete CODA_ALLOC().
I made a couple related changes in coda_psdev_write(). First, I added
some error handling to avoid a NULL dereference if the allocation
failed. Second, I used kvmalloc() instead of kvzalloc() because we copy
over the memory on the next line so there is no need to zero it first.
Link: http://lkml.kernel.org/r/e56010c822e7a7cbaa8a238cf82ad31c67eaa800.1558117389.git.jaharkes@cs.cmu.edu
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Fabian Frederick <fabf@skynet.be>
Cc: Mikko Rapeli <mikko.rapeli@iki.fi>
Cc: Sam Protsenko <semen.protsenko@linaro.org>
Cc: Yann Droneaud <ydroneaud@opteya.com>
Cc: Zhouyang Jia <jiazhouyang09@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/coda/upcall.c')
-rw-r--r-- | fs/coda/upcall.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c index cf1e662681a5..b6ac5fc98189 100644 --- a/fs/coda/upcall.c +++ b/fs/coda/upcall.c | |||
@@ -46,7 +46,7 @@ static void *alloc_upcall(int opcode, int size) | |||
46 | { | 46 | { |
47 | union inputArgs *inp; | 47 | union inputArgs *inp; |
48 | 48 | ||
49 | CODA_ALLOC(inp, union inputArgs *, size); | 49 | inp = kvzalloc(size, GFP_KERNEL); |
50 | if (!inp) | 50 | if (!inp) |
51 | return ERR_PTR(-ENOMEM); | 51 | return ERR_PTR(-ENOMEM); |
52 | 52 | ||
@@ -743,7 +743,7 @@ static int coda_upcall(struct venus_comm *vcp, | |||
743 | sig_req = kmalloc(sizeof(struct upc_req), GFP_KERNEL); | 743 | sig_req = kmalloc(sizeof(struct upc_req), GFP_KERNEL); |
744 | if (!sig_req) goto exit; | 744 | if (!sig_req) goto exit; |
745 | 745 | ||
746 | CODA_ALLOC((sig_req->uc_data), char *, sizeof(struct coda_in_hdr)); | 746 | sig_req->uc_data = kvzalloc(sizeof(struct coda_in_hdr), GFP_KERNEL); |
747 | if (!sig_req->uc_data) { | 747 | if (!sig_req->uc_data) { |
748 | kfree(sig_req); | 748 | kfree(sig_req); |
749 | goto exit; | 749 | goto exit; |