diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-08-04 13:24:41 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-08-04 13:24:41 +0930 |
| commit | b916113d820adc856aad6b8ebc1a25403ff7f293 (patch) | |
| tree | abddf239d912c4868faf9fbc69c67d980f74c7df /fs/nfsd/state.h | |
| parent | 2e4db6c6be91ade074c1a150a6db2aeb4920e25c (diff) | |
| parent | b05965f284db3e086022f4e318e46cb5bffb1376 (diff) | |
| download | talos-obmc-linux-openbmc-4.4-20160804-1.tar.gz talos-obmc-linux-openbmc-4.4-20160804-1.zip | |
Merge tag 'v4.4.16' into dev-4.4openbmc-4.4-20160804-1
This is the 4.4.16 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
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 77fdf4de91ba..77860b75da9d 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) |
