Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/nfs/callback_proc.c

+2 −9
Original line number Diff line number Diff line
@@ -317,16 +317,9 @@ static u32 initiate_bulk_draining(struct nfs_client *clp, 
static u32 do_callback_layoutrecall(struct nfs_client *clp,

				    struct cb_layoutrecallargs *args)

{

	u32 res;



	dprintk("%s enter, type=%i\n", __func__, args->cbl_recall_type);

	if (args->cbl_recall_type == RETURN_FILE)

		res = initiate_file_draining(clp, args);

	else

		res = initiate_bulk_draining(clp, args);

	dprintk("%s returning %i\n", __func__, res);

	return res;



		return initiate_file_draining(clp, args);

	return initiate_bulk_draining(clp, args);

}



__be32 nfs4_callback_layoutrecall(struct cb_layoutrecallargs *args,