* [nfs-utils PATCH] nfsdctl: fix lockd config during autostart
@ 2025-05-01 18:19 Scott Mayhew
2025-05-02 13:24 ` Jeff Layton
2025-05-07 14:08 ` Steve Dickson
0 siblings, 2 replies; 3+ messages in thread
From: Scott Mayhew @ 2025-05-01 18:19 UTC (permalink / raw)
To: steved; +Cc: jlayton, linux-nfs
Be sure to actually send the lockd config values over the netlink
interface.
While we're at it, get rid of the unused "ret" variable.
Fixes: f61c2ff8 ("nfsdctl: add necessary bits to configure lockd")
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
utils/nfsdctl/nfsdctl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c
index 733756a9..ae435932 100644
--- a/utils/nfsdctl/nfsdctl.c
+++ b/utils/nfsdctl/nfsdctl.c
@@ -1417,7 +1417,6 @@ static int lockd_configure(struct nl_sock *sock, int grace)
{
char *tcp_svc, *udp_svc;
int tcpport = 0, udpport = 0;
- int ret;
tcp_svc = conf_get_str("lockd", "port");
if (tcp_svc) {
@@ -1432,6 +1431,8 @@ static int lockd_configure(struct nl_sock *sock, int grace)
if (udpport < 0)
return 1;
}
+
+ return lockd_config_doit(sock, LOCKD_CMD_SERVER_SET, grace, tcpport, udpport);
}
static int
--
2.48.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [nfs-utils PATCH] nfsdctl: fix lockd config during autostart
2025-05-01 18:19 [nfs-utils PATCH] nfsdctl: fix lockd config during autostart Scott Mayhew
@ 2025-05-02 13:24 ` Jeff Layton
2025-05-07 14:08 ` Steve Dickson
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Layton @ 2025-05-02 13:24 UTC (permalink / raw)
To: Scott Mayhew, steved; +Cc: linux-nfs
On Thu, 2025-05-01 at 14:19 -0400, Scott Mayhew wrote:
> Be sure to actually send the lockd config values over the netlink
> interface.
>
> While we're at it, get rid of the unused "ret" variable.
>
> Fixes: f61c2ff8 ("nfsdctl: add necessary bits to configure lockd")
> Signed-off-by: Scott Mayhew <smayhew@redhat.com>
> ---
> utils/nfsdctl/nfsdctl.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c
> index 733756a9..ae435932 100644
> --- a/utils/nfsdctl/nfsdctl.c
> +++ b/utils/nfsdctl/nfsdctl.c
> @@ -1417,7 +1417,6 @@ static int lockd_configure(struct nl_sock *sock, int grace)
> {
> char *tcp_svc, *udp_svc;
> int tcpport = 0, udpport = 0;
> - int ret;
>
> tcp_svc = conf_get_str("lockd", "port");
> if (tcp_svc) {
> @@ -1432,6 +1431,8 @@ static int lockd_configure(struct nl_sock *sock, int grace)
> if (udpport < 0)
> return 1;
> }
> +
> + return lockd_config_doit(sock, LOCKD_CMD_SERVER_SET, grace, tcpport, udpport);
> }
>
> static int
Doh! Good catch!
Reviewed-by: Jeff Layton <jlayton@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [nfs-utils PATCH] nfsdctl: fix lockd config during autostart
2025-05-01 18:19 [nfs-utils PATCH] nfsdctl: fix lockd config during autostart Scott Mayhew
2025-05-02 13:24 ` Jeff Layton
@ 2025-05-07 14:08 ` Steve Dickson
1 sibling, 0 replies; 3+ messages in thread
From: Steve Dickson @ 2025-05-07 14:08 UTC (permalink / raw)
To: Scott Mayhew; +Cc: jlayton, linux-nfs
On 5/1/25 2:19 PM, Scott Mayhew wrote:
> Be sure to actually send the lockd config values over the netlink
> interface.
>
> While we're at it, get rid of the unused "ret" variable.
>
> Fixes: f61c2ff8 ("nfsdctl: add necessary bits to configure lockd")
> Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Committed... (tag: nfs-utils-2-8-4-rc1)
steved.
> ---
> utils/nfsdctl/nfsdctl.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c
> index 733756a9..ae435932 100644
> --- a/utils/nfsdctl/nfsdctl.c
> +++ b/utils/nfsdctl/nfsdctl.c
> @@ -1417,7 +1417,6 @@ static int lockd_configure(struct nl_sock *sock, int grace)
> {
> char *tcp_svc, *udp_svc;
> int tcpport = 0, udpport = 0;
> - int ret;
>
> tcp_svc = conf_get_str("lockd", "port");
> if (tcp_svc) {
> @@ -1432,6 +1431,8 @@ static int lockd_configure(struct nl_sock *sock, int grace)
> if (udpport < 0)
> return 1;
> }
> +
> + return lockd_config_doit(sock, LOCKD_CMD_SERVER_SET, grace, tcpport, udpport);
> }
>
> static int
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-07 14:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-01 18:19 [nfs-utils PATCH] nfsdctl: fix lockd config during autostart Scott Mayhew
2025-05-02 13:24 ` Jeff Layton
2025-05-07 14:08 ` Steve Dickson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox