diff options
| author | Martin Schwenke <martin@meltin.net> | 2022-03-18 10:33:05 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2022-06-24 09:49:32 +0000 |
| commit | 09fd1e55796509b08a8cce39420c3c656024455c (patch) | |
| tree | 89be262cb4e8d69217753eb6f46bbd801f8715bb | |
| parent | a43a1ebe51d61790a9f762ab04aa5b9d809953d5 (diff) | |
| download | samba-09fd1e55796509b08a8cce39420c3c656024455c.tar.gz | |
ctdb-scripts: Move nfslock out of basic_stop() and basic_start()
These are only called in one place and should be done inline, since
that is less confusing.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
| -rwxr-xr-x | ctdb/config/nfs-linux-kernel-callout | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/ctdb/config/nfs-linux-kernel-callout b/ctdb/config/nfs-linux-kernel-callout index 1dce7595a36..963c8b5eca2 100755 --- a/ctdb/config/nfs-linux-kernel-callout +++ b/ctdb/config/nfs-linux-kernel-callout @@ -123,13 +123,6 @@ basic_stop() service "$nfs_lock_service" stop fi ;; - nfslock) - if [ -n "$nfs_lock_service" ]; then - service "$nfs_lock_service" stop - else - service "$nfs_service" stop - fi - ;; *) usage ;; @@ -150,13 +143,6 @@ basic_start() service "$nfs_rquotad_service" start fi ;; - nfslock) - if [ -n "$nfs_lock_service" ]; then - service "$nfs_lock_service" start - else - service "$nfs_service" start - fi - ;; *) usage ;; @@ -175,7 +161,11 @@ service_stop() pkill -9 nfsd ;; nlockmgr) - basic_stop "nfslock" >/dev/null 2>&1 || true + if [ -n "$nfs_lock_service" ]; then + service "$nfs_lock_service" stop >/dev/null 2>&1 || true + else + service "$nfs_service" stop >/dev/null 2>&1 || true + fi ;; mountd) if [ -n "$nfs_mountd_service" ]; then @@ -217,7 +207,11 @@ service_start() basic_start "nfs" ;; nlockmgr) - basic_start "nfslock" + if [ -n "$nfs_lock_service" ]; then + service "$nfs_lock_service" start + else + service "$nfs_service" start + fi ;; mountd) if [ -n "$nfs_mountd_service" ]; then |