diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 07:29:44 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 07:29:44 -0700 |
commit | 194c8581eb9b6d42e9232c7693d86d2ee3799986 (patch) | |
tree | 86d926b7407c33379dd719fad2ccaf03d5c5228a /fs/nfsd/state.h | |
parent | c0ff9019ee64101fda8f19338da799fda8217e14 (diff) | |
parent | 33688abb2802ff3a230bd2441f765477b94cc89e (diff) | |
download | talos-obmc-linux-194c8581eb9b6d42e9232c7693d86d2ee3799986.tar.gz talos-obmc-linux-194c8581eb9b6d42e9232c7693d86d2ee3799986.zip |
Merge 4.7-rc4 into char-misc-next
We want those fixes in here to help with merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfsd/state.h')
-rw-r--r-- | fs/nfsd/state.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 986e51e5ceac..64053eadeb81 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -535,7 +535,7 @@ struct nfs4_ol_stateid { unsigned char st_access_bmap; unsigned char st_deny_bmap; struct nfs4_ol_stateid *st_openstp; - struct rw_semaphore st_rwsem; + struct mutex st_mutex; }; static inline struct nfs4_ol_stateid *openlockstateid(struct nfs4_stid *s) |