2008-02-27 05:52:52

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: nfs client fixup

Hi Trond,

I assume you have already found this, but the current linux-next tree
fails to build if CONFIG_NFS_V4 is not set and CONFIG_NFS_FS is set.

s/nfs/client.c:192: error: 'struct nfs_client' has no member named 'cl_rpcwaitq'

--
Cheers,
Stephen Rothwell [email protected]

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 2b20650..b7daf24 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -189,7 +189,9 @@ static void nfs_free_client(struct nfs_client *clp)
if (__test_and_clear_bit(NFS_CS_CALLBACK, &clp->cl_res_state))
nfs_callback_down();

+#ifdef CONFIG_NFS_V4
rpc_destroy_wait_queue(&clp->cl_rpcwaitq);
+#endif
kfree(clp->cl_hostname);
kfree(clp);



2008-02-27 08:16:42

by Trond Myklebust

[permalink] [raw]
Subject: Re: linux-next: nfs client fixup


On Wed, 2008-02-27 at 16:52 +1100, Stephen Rothwell wrote:
> Hi Trond,
>
> I assume you have already found this, but the current linux-next tree
> fails to build if CONFIG_NFS_V4 is not set and CONFIG_NFS_FS is set.
>
> s/nfs/client.c:192: error: 'struct nfs_client' has no member named 'cl_rpcwaitq'
>

Thanks Stephen! I assume I can add a signed-off-by line on your behalf?

Cheers
Trond


2008-02-27 10:57:03

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: nfs client fixup

Hi Trond,

On Wed, 27 Feb 2008 00:16:36 -0800 Trond Myklebust <[email protected]> wrote:
>
> On Wed, 2008-02-27 at 16:52 +1100, Stephen Rothwell wrote:
> >
> > I assume you have already found this, but the current linux-next tree
> > fails to build if CONFIG_NFS_V4 is not set and CONFIG_NFS_FS is set.
> >
> > s/nfs/client.c:192: error: 'struct nfs_client' has no member named 'cl_rpcwaitq'
> >
>
> Thanks Stephen! I assume I can add a signed-off-by line on your behalf?

Yes, but I would prefer that you fold this back into the original patch
that caused the breakage so that we don't have a bisection hole (if that
is at all possible.

I didn't actually test (or even compile) the fix I posted as it seemed
obvious ...

--
Cheers,
Stephen Rothwell [email protected]


Attachments:
(No filename) (827.00 B)
(No filename) (189.00 B)
Download all attachments