diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-07-02 10:50:45 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-07-02 10:50:45 +0200 |
commit | 046e9ceefab985a137fbd15b946497a88e5a6513 (patch) | |
tree | 29cb2fd3a2783afacc7901f3310bea7a02f84140 /fs/nfsd/state.h | |
parent | 62db7152c924e4c060e42b34a69cd39658e8a0dc (diff) | |
parent | 7c5eec4edf4693aa61f3ee78bf28621dfe33d9f0 (diff) | |
download | op-kernel-dev-046e9ceefab985a137fbd15b946497a88e5a6513.zip op-kernel-dev-046e9ceefab985a137fbd15b946497a88e5a6513.tar.gz |
Merge tag 'asoc-fix-v4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.7
A small clutch of hardware specific fixes for various ASoC devices, all
small individually and important if you have that device but not
otherwise.
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 986e51e..64053ea 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) |