Commit 1a916ce0 authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust

NFS: Clean up do_callback_layoutrecall()

Removing the dprintk()s lets us simplify the function by removing the
else condition entirely and returning the status of
initiate_{file,bulk}_draining() directly.
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent a7878ca1
...@@ -317,16 +317,9 @@ static u32 initiate_bulk_draining(struct nfs_client *clp, ...@@ -317,16 +317,9 @@ static u32 initiate_bulk_draining(struct nfs_client *clp,
static u32 do_callback_layoutrecall(struct nfs_client *clp, static u32 do_callback_layoutrecall(struct nfs_client *clp,
struct cb_layoutrecallargs *args) struct cb_layoutrecallargs *args)
{ {
u32 res;
dprintk("%s enter, type=%i\n", __func__, args->cbl_recall_type);
if (args->cbl_recall_type == RETURN_FILE) if (args->cbl_recall_type == RETURN_FILE)
res = initiate_file_draining(clp, args); return initiate_file_draining(clp, args);
else return initiate_bulk_draining(clp, args);
res = initiate_bulk_draining(clp, args);
dprintk("%s returning %i\n", __func__, res);
return res;
} }
__be32 nfs4_callback_layoutrecall(struct cb_layoutrecallargs *args, __be32 nfs4_callback_layoutrecall(struct cb_layoutrecallargs *args,
......
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