• Chuck Lever's avatar
    NFSD: move lockd_up() before svc_addsock() · ea068bad
    Chuck Lever authored
    Clean up.
    
    A couple of years ago, a series of commits, finishing with commit
    5680c446, swapped the order of the lockd_up() and svc_addsock() calls
    in __write_ports().  At that time lockd_up() needed to know the
    transport protocol of the passed-in socket to start a listener on the
    same transport protocol.
    
    These days, lockd_up() doesn't take a protocol argument; it always
    starts both a UDP and TCP listener.  It's now more straightforward to
    try the lockd_up() first, then do a lockd_down() if the svc_addsock()
    fails.
    
    Careful review of this code shows that the svc_sock_names() call is
    used only to close the just-opened socket in case lockd_up() fails.
    So it is no longer needed if lockd_up() is done first.
    Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
    Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
    ea068bad
nfsctl.c 35.7 KB