mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
NFS: kzalloc conversion in fs/nfs
this converts fs/nfs to kzalloc() usage. compile tested with make allyesconfig Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
a162a6b804
commit
bd6475454c
@ -101,11 +101,9 @@ nfs_idmap_new(struct nfs4_client *clp)
|
||||
|
||||
if (clp->cl_idmap != NULL)
|
||||
return;
|
||||
if ((idmap = kmalloc(sizeof(*idmap), GFP_KERNEL)) == NULL)
|
||||
if ((idmap = kzalloc(sizeof(*idmap), GFP_KERNEL)) == NULL)
|
||||
return;
|
||||
|
||||
memset(idmap, 0, sizeof(*idmap));
|
||||
|
||||
snprintf(idmap->idmap_path, sizeof(idmap->idmap_path),
|
||||
"%s/idmap", clp->cl_rpcclient->cl_pathname);
|
||||
|
||||
|
@ -1638,10 +1638,9 @@ static struct super_block *nfs_get_sb(struct file_system_type *fs_type,
|
||||
#endif /* CONFIG_NFS_V3 */
|
||||
|
||||
s = ERR_PTR(-ENOMEM);
|
||||
server = kmalloc(sizeof(struct nfs_server), GFP_KERNEL);
|
||||
server = kzalloc(sizeof(struct nfs_server), GFP_KERNEL);
|
||||
if (!server)
|
||||
goto out_err;
|
||||
memset(server, 0, sizeof(struct nfs_server));
|
||||
/* Zero out the NFS state stuff */
|
||||
init_nfsv4_state(server);
|
||||
server->client = server->client_sys = server->client_acl = ERR_PTR(-EINVAL);
|
||||
@ -1942,10 +1941,9 @@ static struct super_block *nfs4_get_sb(struct file_system_type *fs_type,
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
server = kmalloc(sizeof(struct nfs_server), GFP_KERNEL);
|
||||
server = kzalloc(sizeof(struct nfs_server), GFP_KERNEL);
|
||||
if (!server)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
memset(server, 0, sizeof(struct nfs_server));
|
||||
/* Zero out the NFS state stuff */
|
||||
init_nfsv4_state(server);
|
||||
server->client = server->client_sys = server->client_acl = ERR_PTR(-EINVAL);
|
||||
|
@ -163,10 +163,9 @@ nfs_async_unlink(struct dentry *dentry)
|
||||
struct rpc_clnt *clnt = NFS_CLIENT(dir->d_inode);
|
||||
int status = -ENOMEM;
|
||||
|
||||
data = kmalloc(sizeof(*data), GFP_KERNEL);
|
||||
data = kzalloc(sizeof(*data), GFP_KERNEL);
|
||||
if (!data)
|
||||
goto out;
|
||||
memset(data, 0, sizeof(*data));
|
||||
|
||||
data->cred = rpcauth_lookupcred(clnt->cl_auth, 0);
|
||||
if (IS_ERR(data->cred)) {
|
||||
|
@ -100,10 +100,8 @@ static inline struct nfs_write_data *nfs_commit_alloc(unsigned int pagecount)
|
||||
p->pagevec = &p->page_array[0];
|
||||
else {
|
||||
size_t size = ++pagecount * sizeof(struct page *);
|
||||
p->pagevec = kmalloc(size, GFP_NOFS);
|
||||
if (p->pagevec) {
|
||||
memset(p->pagevec, 0, size);
|
||||
} else {
|
||||
p->pagevec = kzalloc(size, GFP_NOFS);
|
||||
if (!p->pagevec) {
|
||||
mempool_free(p, nfs_commit_mempool);
|
||||
p = NULL;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user