Commit 19274716 authored Oct 26, 2016 by Anna Schumaker

NFS: Don't print a pNFS error if we aren't using pNFS



We used to check for a valid layout type id before verifying pNFS flags
as an indicator for if we are using pNFS.  This changed in 3132e49e
with the introduction of multiple layout types, since now we are passing
an array of ids instead of just one.  Since then, users have been seeing
a KERN_ERR printk show up whenever mounting NFS v4 without pNFS.  This
patch restores the original behavior of exiting set_pnfs_layoutdriver()
early if we aren't using pNFS.

Fixes 3132e49e ("pnfs: track multiple layout types in fsinfo
structure")
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

parent 8ef32955

fs/nfs/pnfs.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -146,6 +146,8 @@ set_pnfs_layoutdriver(struct nfs_server server, const struct nfs_fh mntfh,
		u32 id;
		int i;

		if (fsinfo->nlayouttypes == 0)
		goto out_no_driver;
		if (!(server->nfs_client->cl_exchange_flags &
		(EXCHGID4_FLAG_USE_NON_PNFS \| EXCHGID4_FLAG_USE_PNFS_MDS))) {
		printk(KERN_ERR "NFS: %s: cl_exchange_flags 0x%x\n",

Admin message