UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd: fix locking validator warning on nfs4_ol_stateid->st_mutex class 

The use of the st_mutex has been confusing the validator. Use the
proper nested notation so as to not produce warnings.

Signed-off-by: Andrew Elble <aweits@rit.edu>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Andrew Elble 2017-11-08 17:29:51 -05:00 committed by J. Bruce Fields
parent e919b07652
commit 4f34bd0540
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/nfsd/nfs4state.c
View File

@ -86,6 +86,11 @@ static void nfs4_free_ol_stateid(struct nfs4_stid *stid);
*/ */
static DEFINE_SPINLOCK(state_lock); static DEFINE_SPINLOCK(state_lock);
enum nfsd4_st_mutex_lock_subclass {
OPEN_STATEID_MUTEX = 0,
LOCK_STATEID_MUTEX = 1,
};
/* /*
* A waitqueue for all in-progress 4.0 CLOSE operations that are waiting for * A waitqueue for all in-progress 4.0 CLOSE operations that are waiting for
* the refcount on the open stateid to drop. * the refcount on the open stateid to drop.
@ -3600,7 +3605,7 @@ nfsd4_lock_ol_stateid(struct nfs4_ol_stateid *stp)
{ {
__be32 ret; __be32 ret;
mutex_lock(&stp->st_mutex); mutex_lock_nested(&stp->st_mutex, LOCK_STATEID_MUTEX);
ret = nfsd4_verify_open_stid(&stp->st_stid); ret = nfsd4_verify_open_stid(&stp->st_stid);
if (ret != nfs_ok) if (ret != nfs_ok)
mutex_unlock(&stp->st_mutex); mutex_unlock(&stp->st_mutex);
@ -3664,7 +3669,7 @@ init_open_stateid(struct nfs4_file *fp, struct nfsd4_open *open)
stp = open->op_stp; stp = open->op_stp;
/* We are moving these outside of the spinlocks to avoid the warnings */ /* We are moving these outside of the spinlocks to avoid the warnings */
mutex_init(&stp->st_mutex); mutex_init(&stp->st_mutex);
mutex_lock(&stp->st_mutex); mutex_lock_nested(&stp->st_mutex, OPEN_STATEID_MUTEX);
retry: retry:
spin_lock(&oo->oo_owner.so_client->cl_lock); spin_lock(&oo->oo_owner.so_client->cl_lock);
@ -5741,7 +5746,7 @@ init_lock_stateid(struct nfs4_ol_stateid *stp, struct nfs4_lockowner *lo,
struct nfs4_ol_stateid *retstp; struct nfs4_ol_stateid *retstp;
mutex_init(&stp->st_mutex); mutex_init(&stp->st_mutex);
mutex_lock(&stp->st_mutex); mutex_lock_nested(&stp->st_mutex, OPEN_STATEID_MUTEX);
retry: retry:
spin_lock(&clp->cl_lock); spin_lock(&clp->cl_lock);
spin_lock(&fp->fi_lock); spin_lock(&fp->fi_lock);