1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index ab5c236bd9a7..db348f749376 100644
--- a/include/linux/nfsd/state.h
+++ b/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;
 };
 
@@ -224,6 +224,7 @@ struct nfs4_file {
         struct inode            *fi_inode;
         u32                     fi_id;      /* used with stateowner->so_id 
                                              * for stateid_hashtbl hash */
+        bool                    fi_had_conflict;
 };
 
 /*