diff --git a/[refs] b/[refs] index 100673d399f4..dea479df3703 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a8db97e7756119689c93c431e8b8324080f5625 +refs/heads/master: 33a1060ae7dc671a0208b341bd454009625bb5a6 diff --git a/trunk/include/linux/nfsd/state.h b/trunk/include/linux/nfsd/state.h index ab5c236bd9a7..732de9cad4a8 100644 --- a/trunk/include/linux/nfsd/state.h +++ b/trunk/include/linux/nfsd/state.h @@ -67,7 +67,7 @@ struct nfs4_cb_recall { int cbr_trunc; stateid_t cbr_stateid; u32 cbr_fhlen; - u32 cbr_fhval[NFS4_FHSIZE]; + char cbr_fhval[NFS4_FHSIZE]; struct nfs4_delegation *cbr_dp; };