---

yaml --- r: 225151 b: refs/heads/master c: 533a19b h: refs/heads/master i: 225149: f3bf2d6 225147: 481559a 225143: c253605 225135: 7243018 225119: d6fe045 225087: 9a9037b 225023: 9e9815e v: v3
git-mirror · Nov 4, 2010 · 47ffeee · 47ffeee
1 parent a257c55
commit 47ffeee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fcedec752108de5d99b9f0373ff880756a1e87d
+refs/heads/master: 533a19b4b88fcf81da3106b94f0ac4ac8b33a248
diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c
@@ -401,15 +401,14 @@ void vhost_dev_cleanup(struct vhost_dev *dev)
 	kfree(rcu_dereference_protected(dev->memory,
 					lockdep_is_held(&dev->mutex)));
 	RCU_INIT_POINTER(dev->memory, NULL);
-	if (dev->mm)
-		mmput(dev->mm);
-	dev->mm = NULL;
-
 	WARN_ON(!list_empty(&dev->work_list));
 	if (dev->worker) {
 		kthread_stop(dev->worker);
 		dev->worker = NULL;
 	}
+	if (dev->mm)
+		mmput(dev->mm);
+	dev->mm = NULL;
 }
 
 static int log_access_ok(void __user *log_base, u64 addr, unsigned long sz)