[PATCH v6.13-rc1 4/5] dlm: make sense out of force values

[Alexander Aring <aahringo@redhat.com>]

Currently users e.g. gfs2 calling lockspace_busy() with 2 which seems
not to be specified but it is specified as the rest of force value
meanings besides 0 and 1 which means: do check nothing. That makes no
sense as we can never introduce any new force value to have a specific
new meaning for it.

We just switch now to have 2 as meaning as do check on nothing and the
other values will return -EINVAL if somebody calls
dlm_release_lockspace() with them. This might break API but it totally
makes no sense to not use the other values of the force parameter.

All kernel users, gfs2 and md-cluster uses 2 as force parameter which
has the meaning: do check on nothing and let recovery deal with it.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
---
 fs/dlm/lockspace.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 8afac6e2dff0..1a216a8b6ca2 100644
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -691,8 +691,10 @@ static int lockspace_busy(struct dlm_ls *ls, int force)
 				break;
 			}
 		}
-	} else {
+	} else if (force == 2) {
 		rv = 0;
+	} else {
+		rv = -EINVAL;
 	}
 	read_unlock_bh(&ls->ls_lkbxa_lock);
 	return rv;
@@ -703,6 +705,8 @@ static int release_lockspace(struct dlm_ls *ls, int force)
 	int busy, rv;
 
 	busy = lockspace_busy(ls, force);
+	if (busy < 0)
+		return busy;
 
 	spin_lock_bh(&lslist_lock);
 	if (ls->ls_create_count == 1) {
@@ -730,7 +734,7 @@ static int release_lockspace(struct dlm_ls *ls, int force)
 
 	dlm_device_deregister(ls);
 
-	if (force < 3 && dlm_user_daemon_available())
+	if (dlm_user_daemon_available())
 		do_uevent(ls, 0);
 
 	dlm_recoverd_stop(ls);
-- 
2.43.0