Commit 9216106a authored by Trond Myklebust's avatar Trond Myklebust

NFSv4.1: clean up nfs4_recall_slot to use nfs4_alloc_slots

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 2d473d37
...@@ -258,6 +258,8 @@ extern int nfs4_proc_get_lease_time(struct nfs_client *clp, ...@@ -258,6 +258,8 @@ extern int nfs4_proc_get_lease_time(struct nfs_client *clp,
extern int nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, extern int nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data,
bool sync); bool sync);
extern struct nfs4_slot *nfs4_alloc_slots(u32 max_slots, gfp_t gfp_flags);
static inline bool static inline bool
is_ds_only_client(struct nfs_client *clp) is_ds_only_client(struct nfs_client *clp)
{ {
......
...@@ -5656,7 +5656,7 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo) ...@@ -5656,7 +5656,7 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo)
return status; return status;
} }
static struct nfs4_slot *nfs4_alloc_slots(u32 max_slots, gfp_t gfp_flags) struct nfs4_slot *nfs4_alloc_slots(u32 max_slots, gfp_t gfp_flags)
{ {
return kmalloc_array(max_slots, sizeof(struct nfs4_slot), gfp_flags); return kmalloc_array(max_slots, sizeof(struct nfs4_slot), gfp_flags);
} }
......
...@@ -2033,8 +2033,7 @@ static int nfs4_recall_slot(struct nfs_client *clp) ...@@ -2033,8 +2033,7 @@ static int nfs4_recall_slot(struct nfs_client *clp)
return 0; return 0;
nfs4_begin_drain_session(clp); nfs4_begin_drain_session(clp);
fc_tbl = &clp->cl_session->fc_slot_table; fc_tbl = &clp->cl_session->fc_slot_table;
new = kmalloc(fc_tbl->target_max_slots * sizeof(struct nfs4_slot), new = nfs4_alloc_slots(fc_tbl->target_max_slots, GFP_NOFS);
GFP_NOFS);
if (!new) if (!new)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment