diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-10-26 19:47:04 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-10-26 19:56:42 +0200 |
| commit | 036a1075978e35811f22be3ff86a70cb8d22cb85 (patch) | |
| tree | 5042cb277cef56ece773f6f091c953d857a64417 /fs/nfs/nfsroot.c | |
| parent | net/sunrpc: Use static const char arrays (diff) | |
| download | linux-036a1075978e35811f22be3ff86a70cb8d22cb85.tar.xz linux-036a1075978e35811f22be3ff86a70cb8d22cb85.zip | |
NFS: Fix a compile issue in nfs_root
Stephen Rothwell reports:
> /home/test/linux-2.6/fs/nfs/nfsroot.c: In function 'nfs_root_debug':
> /home/test/linux-2.6/fs/nfs/nfsroot.c:110:2: error: 'nfs_debug'
> undeclared (first use in this function)
> /home/test/linux-2.6/fs/nfs/nfsroot.c:110:2: note: each undeclared
> identifier is reported only once for each function it appears in
> make[3]: *** [fs/nfs/nfsroot.o] Error 1
> make[2]: *** [fs/nfs] Error 2
> make[1]: *** [fs] Error 2
> make: *** [sub-make] Error 2
Which is caused by commit 306a075362a288683f6346185f97dd0e06df19da
(NFS: Allow NFSROOT debugging messages to be enabled dynamically)
Fix is to disable this code when RPC_DEBUG is disabled.
Reported-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
Tested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfsroot.c')
| -rw-r--r-- | fs/nfs/nfsroot.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index 460df3652889..903908a20023 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c @@ -101,6 +101,7 @@ static char nfs_export_path[NFS_MAXPATHLEN + 1] __initdata = ""; /* server:export path string passed to super.c */ static char nfs_root_device[NFS_MAXPATHLEN + 1] __initdata = ""; +#ifdef RPC_DEBUG /* * When the "nfsrootdebug" kernel command line option is specified, * enable debugging messages for NFSROOT. @@ -112,6 +113,7 @@ static int __init nfs_root_debug(char *__unused) } __setup("nfsrootdebug", nfs_root_debug); +#endif /* * Parse NFS server and directory information passed on the kernel |