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

Commit 7e03b7cc authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Fix a compile issue when !CONFIG_NFS_V4_1 



The attempt to display the implementation ID needs to be conditional on
whether or not CONFIG_NFS_V4_1 is defined

Reported-by: default avatarBryan Schumaker <Bryan.Schumaker@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 91e56aae

fs/nfs/super.c

+19 −9
Original line number Diff line number Diff line
@@ -775,7 +775,6 @@ static void show_sessions(struct seq_file *m, struct nfs_server *server) {} 
#endif

#endif



#ifdef CONFIG_NFS_V4

#ifdef CONFIG_NFS_V4_1

static void show_pnfs(struct seq_file *m, struct nfs_server *server)

{
@@ -785,9 +784,26 @@ static void show_pnfs(struct seq_file *m, struct nfs_server *server) 
	else

		seq_printf(m, "not configured");

}



static void show_implementation_id(struct seq_file *m, struct nfs_server *nfss)

{

	if (nfss->nfs_client && nfss->nfs_client->impl_id) {

		struct nfs41_impl_id *impl_id = nfss->nfs_client->impl_id;

		seq_printf(m, "\n\timpl_id:\tname='%s',domain='%s',"

			   "date='%llu,%u'",

			   impl_id->name, impl_id->domain,

			   impl_id->date.seconds, impl_id->date.nseconds);

	}

}

#else

static void show_pnfs(struct seq_file *m, struct nfs_server *server) {}

#ifdef CONFIG_NFS_V4

static void show_pnfs(struct seq_file *m, struct nfs_server *server)

{

}

#endif

static void show_implementation_id(struct seq_file *m, struct nfs_server *nfss)

{

}

#endif



static int nfs_show_devname(struct seq_file *m, struct dentry *root)
@@ -836,13 +852,7 @@ static int nfs_show_stats(struct seq_file *m, struct dentry *root) 


	seq_printf(m, "\n\tage:\t%lu", (jiffies - nfss->mount_time) / HZ);



	if (nfss->nfs_client && nfss->nfs_client->impl_id) {

		struct nfs41_impl_id *impl_id = nfss->nfs_client->impl_id;

		seq_printf(m, "\n\timpl_id:\tname='%s',domain='%s',"

			   "date='%llu,%u'",

			   impl_id->name, impl_id->domain,

			   impl_id->date.seconds, impl_id->date.nseconds);

	}

	show_implementation_id(m, nfss);



	seq_printf(m, "\n\tcaps:\t");

	seq_printf(m, "caps=0x%x", nfss->caps);