Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6] / include / linux / nfsd / state.h

diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 732de9cad4a8db0dd4998d806861e51de62ef840..db348f7493763507885ec8833d796c6d3b2345bd 100644 (file)
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -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;
 };
 
 /*