Re: [PATCH] statd: not unlinking host files

["J. Bruce Fields" <bfields@fieldses.org>]

On Sat, Dec 06, 2008 at 09:34:25AM -0500, Steve Dickson wrote:
> Again working with the state file code, I notice that statd was
> not unlinking hosts files when the kernel sent up the 
> sm_unmon messages. This following patch address the reason why... 
> 
> Comments?

Bizarre--thanks for catching that.

But it looks like these are actually the only two callers to xunlink?
In which case, we should just ditch the "check" parameter entirely and
avoid some confusion....

(I wonder how it ever got this way in the first case?)

--b.

> 
> steved.
> 
> commit f8536d0e210a8151900f8c68185927790239eb62
> Author: Steve Dickson <steved@redhat.com>
> Date:   Sat Dec 6 09:30:43 2008 -0500
> 
>     statd: not unlinking host files
>     
>     Statd is not unlinking host files during SM_UNMON and
>     SM_UNMON_ALL calls because the given host is still on the run-time
>     notify list (rtnl) and the check flag is set when xunlink() is
>     called. But the next thing the caller of xunlink() does is
>     remove the host from the rtnl list which means the
>     unlink will never happen.
>     
>     So in cases where xunlink() is immediately follow by a call
>     to nlist_free() (which removes the host from the list) the
>     check flag to xunlink() is not set.
>     
>     Signed-off-by: Steve Dickson <steved@redhat.com>
> 
> diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c
> index a6a1d9c..7d6e4da 100644
> --- a/utils/statd/monitor.c
> +++ b/utils/statd/monitor.c
> @@ -352,7 +352,7 @@ sm_unmon_1_svc(struct mon_id *argp, struct svc_req *rqstp)
>  			/* PRC: do the HA callout: */
>  			ha_callout("del-client", mon_name, my_name, -1);
>  
> -			xunlink(SM_DIR, clnt->dns_name, 1);
> +			xunlink(SM_DIR, clnt->dns_name, 0);
>  			nlist_free(&rtnl, clnt);
>  
>  			return (&result);
> @@ -404,7 +404,7 @@ sm_unmon_all_1_svc(struct my_id *argp, struct svc_req *rqstp)
>  			temp = NL_NEXT(clnt);
>  			/* PRC: do the HA callout: */
>  			ha_callout("del-client", mon_name, my_name, -1);
> -			xunlink(SM_DIR, clnt->dns_name, 1);
> +			xunlink(SM_DIR, clnt->dns_name, 0);
>  			nlist_free(&rtnl, clnt);
>  			++count;
>  			clnt = temp;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html