diff --git a/CHANGELOG b/CHANGELOG index 4557bcd..3dd4eb0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -81,6 +81,7 @@ xx/xx/2018 autofs-5.1.5 - initialize struct addrinfo for getaddrinfo() calls. - fix quoted string length calc in expandsunent(). - fix autofs mount options construction. +- mount_nfs.c fix local rdma share not mounting. 19/12/2017 autofs-5.1.4 - fix spec file url. diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c index 4e3e703..f1b3fb3 100644 --- a/modules/mount_nfs.c +++ b/modules/mount_nfs.c @@ -375,9 +375,14 @@ dont_probe: */ if (this->proximity == PROXIMITY_LOCAL) { char *host = this->name ? this->name : "localhost"; - int ret; - - ret = rpc_ping(host, port, vers, 2, 0, RPC_CLOSE_DEFAULT); + int ret = 1; + + /* If we're using RDMA, rpc_ping will fail when + * nfs-server is local. Therefore, don't probe + * when we're using RDMA. + */ + if(!rdma) + ret = rpc_ping(host, port, vers, 2, 0, RPC_CLOSE_DEFAULT); if (ret <= 0) goto next; }