---

yaml --- r: 38810 b: refs/heads/master c: c6e6f0b h: refs/heads/master v: v3
git-mirror · Aug 31, 2006 · 3a92708 · 3a92708
1 parent af1832e
commit 3a92708
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 623d93555c8884768db65ffc11509c93e50dd4db
+refs/heads/master: c6e6f0ba8fc1dea99c7bd020916f24d533b62697
diff --git a/trunk/fs/dlm/user.c b/trunk/fs/dlm/user.c
@@ -325,7 +325,7 @@ static int device_remove_lockspace(struct dlm_lspace_params *params)
 {
 	dlm_lockspace_t *lockspace;
 	struct dlm_ls *ls;
-	int error;
+	int error, force = 0;
 
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
@@ -341,15 +341,18 @@ static int device_remove_lockspace(struct dlm_lspace_params *params)
 	}
 	kfree(ls->ls_device.name);
 
+	if (params->flags & DLM_USER_LSFLG_FORCEFREE)
+		force = 2;
+
 	lockspace = ls->ls_local_handle;
 
 	/* dlm_release_lockspace waits for references to go to zero,
 	   so all processes will need to close their device for the ls
 	   before the release will procede */
 
 	dlm_put_lockspace(ls);
-	error = dlm_release_lockspace(lockspace, 0);
-out:
+	error = dlm_release_lockspace(lockspace, force);
+ out:
 	return error;
 }