summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorFred Isaman <iisaman@netapp.com>2012-06-07 19:42:12 +0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-06-07 21:44:24 +0400
commitfb47ddc9d5ded3d202335ea29743b9242d54eb5a (patch)
tree5587a1835c6a90fc1fc38ca87c28075db90cf4f6 /fs
parentf07936f2c446bd5310e669c8e6eab3f812ea665a (diff)
downloadlinux-fb47ddc9d5ded3d202335ea29743b9242d54eb5a.tar.xz
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/pnfs.h2
1 files changed, 1 insertions, 1 deletions
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);
}