Merge tag 'nfs-for-6.1-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[linux-block.git] / fs / nfs / nfs4proc.c

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 4553803538e5f91618eb85405926ba0662de5f98..e2efcd26336c06d0799a53060e789b2162266a92 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -6608,7 +6608,7 @@ static void nfs4_delegreturn_prepare(struct rpc_task *task, void *data)
        struct nfs4_delegreturndata *d_data;
        struct pnfs_layout_hdr *lo;
 
-       d_data = (struct nfs4_delegreturndata *)data;
+       d_data = data;
 
        if (!d_data->lr.roc && nfs4_wait_on_layoutreturn(d_data->inode, task)) {
                nfs4_sequence_done(task, &d_data->res.seq_res);
@@ -8900,7 +8900,7 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, const struct cred *cred)
 void nfs4_test_session_trunk(struct rpc_clnt *clnt, struct rpc_xprt *xprt,
                            void *data)
 {
-       struct nfs4_add_xprt_data *adata = (struct nfs4_add_xprt_data *)data;
+       struct nfs4_add_xprt_data *adata = data;
        struct rpc_task *task;
        int status;