From: Fred Isaman <iisaman@netapp.com>
Date: Thu, 7 Jun 2012 15:42:12 +0000 (-0400)
Subject: NFS4: Fix open bug when pnfs module blacklisted
X-Git-Tag: firefly_0821_release~3680^2~2604^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fb47ddc9d5ded3d202335ea29743b9242d54eb5a;p=firefly-linux-kernel-4.4.55.git

NFS4: Fix open bug when pnfs module blacklisted

Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 29fd23c0efdc..64f90d845f6a 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -365,7 +365,7 @@ static inline bool
 pnfs_use_threshold(struct nfs4_threshold **dst, struct nfs4_threshold *src,
 		   struct nfs_server *nfss)
 {
-	return (dst && src && src->bm != 0 &&
+	return (dst && src && src->bm != 0 && nfss->pnfs_curr_ld &&
 					nfss->pnfs_curr_ld->id == src->l_type);
 }