summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-03-30 18:46:29 +0200
committerJ. Bruce Fields <bfields@redhat.com>2015-03-30 16:05:26 -0400
commitf3f03330dee0526d82f2a0fd1a79d207ed1ac439 (patch)
tree2f7ea57e37e8773da62c159164c0f41ddb0aa766 /fs
parent7890203da2cb9b861dae9bdb88f882f3e03baec9 (diff)
downloadlinux-stable-f3f03330dee0526d82f2a0fd1a79d207ed1ac439.tar.gz
linux-stable-f3f03330dee0526d82f2a0fd1a79d207ed1ac439.tar.bz2
linux-stable-f3f03330dee0526d82f2a0fd1a79d207ed1ac439.zip
nfsd: require an explicit option to enable pNFS
Turns out sending out layouts to any client is a bad idea if they can't get at the storage device, so require explicit admin action to enable pNFS. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4layouts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 80e236bf79fc..6904213a4363 100644
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -118,7 +118,7 @@ void nfsd4_setup_layout_type(struct svc_export *exp)
{
struct super_block *sb = exp->ex_path.mnt->mnt_sb;
- if (exp->ex_flags & NFSEXP_NOPNFS)
+ if (!(exp->ex_flags & NFSEXP_PNFS))
return;
if (sb->s_export_op->get_uuid &&