On Sat, 08 Mar 2014 10:20:16 -0500 Steve Dickson <SteveD@xxxxxxxxxx> wrote:
> Hey Neil,
>
> This part did not apply cleanly
>
> On 02/20/2014 01:36 AM, Neil Brown wrote:
> > void
> > nfssvc_setvers(unsigned int ctlbits, int minorvers[])
> > {
> > diff --git a/utils/nfsd/nfssvc.h b/utils/nfsd/nfssvc.h
> > index 2bbd3d30f92a..bb7fccee7c19 100644
> > --- a/utils/nfsd/nfssvc.h
> > +++ b/utils/nfsd/nfssvc.h
> > @@ -24,5 +24,6 @@ void nfssvc_mount_nfsdfs(char *progname);
> > int nfssvc_inuse(void);
> > int nfssvc_set_sockets(const int family, const unsigned int protobits,
> > const char *host, const char *port);
> > +int nfssvc_set_rdmaport(const char *port);
> > void nfssvc_setvers(unsigned int ctlbits, int minorvers4[]);
> ^^^ this interface is different that the one I have in my tree
>
> The one I have is
> void nfssvc_setvers(unsigned int ctlbits, unsigned int minorvers4, unsigned int minorvers4set);
The patch which changed that interface to the new one predates my patch by 7
days, so maybe I didn't pull before I did the development.
(I was doing that in my systemd-devel branch which I hadn't rebased recently).
Thanks,
NeilBrown
>
> No biggie but I'm just wandering if I'm missing a patch...
>
> steved.
> > int nfssvc_threads(unsigned short port, int nrservs);
Attachment:
signature.asc
Description: PGP signature
