Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3f03330 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by J. Bruce Fields
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 7890203d

fs/nfsd/nfs4layouts.c

+1 −1
Original line number Diff line number Diff line
@@ -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 &&

include/uapi/linux/nfsd/export.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
 * exported filesystem.

 */

#define	NFSEXP_V4ROOT		0x10000

#define NFSEXP_NOPNFS		0x20000

#define NFSEXP_PNFS		0x20000



/* All flags that we claim to support.  (Note we don't support NOACL.) */

#define NFSEXP_ALLFLAGS		0x3FE7F