NFSv4: remove duplicate clientid in struct nfs_client
Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
7d6d63d642
commit
114f64b5f2
|
@ -1660,7 +1660,7 @@ static void encode_create_session(struct xdr_stream *xdr,
|
|||
|
||||
p = reserve_space(xdr, 20 + 2*28 + 20 + len + 12);
|
||||
*p++ = cpu_to_be32(OP_CREATE_SESSION);
|
||||
p = xdr_encode_hyper(p, clp->cl_ex_clid);
|
||||
p = xdr_encode_hyper(p, clp->cl_clientid);
|
||||
*p++ = cpu_to_be32(clp->cl_seqid); /*Sequence id */
|
||||
*p++ = cpu_to_be32(args->flags); /*flags */
|
||||
|
||||
|
@ -4694,7 +4694,7 @@ static int decode_exchange_id(struct xdr_stream *xdr,
|
|||
p = xdr_inline_decode(xdr, 8);
|
||||
if (unlikely(!p))
|
||||
goto out_overflow;
|
||||
xdr_decode_hyper(p, &clp->cl_ex_clid);
|
||||
xdr_decode_hyper(p, &clp->cl_clientid);
|
||||
p = xdr_inline_decode(xdr, 12);
|
||||
if (unlikely(!p))
|
||||
goto out_overflow;
|
||||
|
|
|
@ -71,8 +71,6 @@ struct nfs_client {
|
|||
#endif /* CONFIG_NFS_V4 */
|
||||
|
||||
#ifdef CONFIG_NFS_V4_1
|
||||
/* clientid returned from EXCHANGE_ID, used by session operations */
|
||||
u64 cl_ex_clid;
|
||||
/* The sequence id to use for the next CREATE_SESSION */
|
||||
u32 cl_seqid;
|
||||
/* The flags used for obtaining the clientid during EXCHANGE_ID */
|
||||
|
|
Loading…
Reference in a new issue