From: J. Bruce Fields <bfields@redhat.com>
Date: Fri, 16 Feb 2018 16:49:11 +0000 (-0500)
Subject: nfsd4: dp->dl_stid.sc_file doesn't need locking
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0c911f5408e49a313dd17f2f331c62c3db515f34;p=openwrt%2Fstaging%2Fblogic.git

nfsd4: dp->dl_stid.sc_file doesn't need locking

The delegation isn't visible to anyone yet.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
---

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 33538b98720a..9e9f32f03bf4 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4411,9 +4411,10 @@ nfs4_set_delegation(struct nfs4_client *clp, struct svc_fh *fh,
 		return ERR_PTR(-ENOMEM);
 
 	get_nfs4_file(fp);
+	dp->dl_stid.sc_file = fp;
+
 	spin_lock(&state_lock);
 	spin_lock(&fp->fi_lock);
-	dp->dl_stid.sc_file = fp;
 	if (!fp->fi_deleg_file) {
 		spin_unlock(&fp->fi_lock);
 		spin_unlock(&state_lock);