Subject: Re: linux-next: build warning after merge of the nfsd tree

From: "J. Bruce Fields" <[email-masked]>
Date: Thu, 17 Mar 2011 14:09:28 -0400

On Thu, Mar 10, 2011 at 11:53:31AM +1100, Stephen Rothwell wrote:
> Hi Bruce,
> 
> After merging the nfsd tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
> 
> net/sunrpc/svcauth_unix.c: In function 'unix_domain_find':
> net/sunrpc/svcauth_unix.c:58: warning: passing argument 1 of 'svcauth_unix_domain_release' from incompatible pointer type
> net/sunrpc/svcauth_unix.c:41: note: expected 'struct auth_domain *' but argument is of type 'struct unix_domain *'
> 
> Introduced by commit 8b3e07ac908d ("svcrpc: fix rare race on unix_domain
> creation").

Should be fixed, thanks for the report.

--b.

commit 352b5d13c0684ba8cd103aa20cb74f105334562a
Author: J. Bruce Fields <[email-masked]>
Date:   Wed Mar 9 22:40:30 2011 -0500

    svcrpc: fix bad argument in unix_domain_find
    
    "After merging the nfsd tree, today's linux-next build (powerpc
    ppc64_defconfig) produced this warning:
    
    net/sunrpc/svcauth_unix.c: In function 'unix_domain_find':
    net/sunrpc/svcauth_unix.c:58: warning: passing argument 1 of
    +'svcauth_unix_domain_release' from incompatible pointer type
    net/sunrpc/svcauth_unix.c:41: note: expected 'struct auth_domain *' but
    argument
    +is of type 'struct unix_domain *'
    
    Introduced by commit 8b3e07ac908d ("svcrpc: fix rare race on unix_domain
    creation")."
    
    Reported-by: Stephen Rothwell <[email-masked]>
    Signed-off-by: J. Bruce Fields <[email-masked]>

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index d100bf2..c8e1021 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -55,7 +55,7 @@ struct auth_domain *unix_domain_find(char *name)
 	while(1) {
 		if (rv) {
 			if (new && rv != &new->h)
-				svcauth_unix_domain_release(new);
+				svcauth_unix_domain_release(&new->h);
 
 			if (rv->flavour != &svcauth_unix) {
 				auth_domain_put(rv);