bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs/afs: use struct_size() in kzalloc()

Browse source 
As Gustavo said in other patches doing the same replace, we can now
use the new struct_size() helper to avoid leaving these open-coded and
prone to type mistake.

Signed-off-by: Zhengyuan Liu <liuzhengyuan@kylinos.cn>
Signed-off-by: David Howells <dhowells@redhat.com>
This commit is contained in:
Zhengyuan Liu 2019-06-20 18:12:17 +01:00 • committed by David Howells
parent 4521819369
commit ee102584ef
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fs/afs/dir.c
View file

@ -242,8 +242,7 @@ retry:
if (nr_inline > (PAGE_SIZE - sizeof(*req)) / sizeof(struct page *)) if (nr_inline > (PAGE_SIZE - sizeof(*req)) / sizeof(struct page *))
nr_inline = 0; nr_inline = 0;
req = kzalloc(sizeof(*req) + sizeof(struct page *) * nr_inline, req = kzalloc(struct_size(req, array, nr_inline), GFP_KERNEL);
GFP_KERNEL);
if (!req) if (!req)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);

6
fs/afs/file.c
View file

@ -314,8 +314,7 @@ int afs_page_filler(void *data, struct page *page)
/* fall through */ /* fall through */
default: default:
go_on: go_on:
req = kzalloc(sizeof(struct afs_read) + sizeof(struct page *), req = kzalloc(struct_size(req, array, 1), GFP_KERNEL);
GFP_KERNEL);
if (!req) if (!req)
goto enomem; goto enomem;
@ -465,8 +464,7 @@ static int afs_readpages_one(struct file *file, struct address_space *mapping,
n++; n++;
} }
req = kzalloc(sizeof(struct afs_read) + sizeof(struct page *) * n, req = kzalloc(struct_size(req, array, n), GFP_NOFS);
GFP_NOFS);
if (!req) if (!req)
return -ENOMEM; return -ENOMEM;

3
fs/afs/write.c
View file

@ -48,8 +48,7 @@ static int afs_fill_page(struct afs_vnode *vnode, struct key *key,
return 0; return 0;
} }
req = kzalloc(sizeof(struct afs_read) + sizeof(struct page *), req = kzalloc(struct_size(req, array, 1), GFP_KERNEL);
GFP_KERNEL);
if (!req) if (!req)
return -ENOMEM; return -ENOMEM;