Skip to content

Commit

Permalink
NFS: Fix a compile issue when !CONFIG_NFS_V4_1
Browse files Browse the repository at this point in the history
The attempt to display the implementation ID needs to be conditional on
whether or not CONFIG_NFS_V4_1 is defined

Reported-by: Bryan Schumaker <Bryan.Schumaker@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Mar 5, 2012
1 parent 91e56aa commit 7e03b7c
Showing 1 changed file with 19 additions and 9 deletions.
28 changes: 19 additions & 9 deletions fs/nfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 7e03b7c

Please sign in to comment.