---

yaml --- r: 251738 b: refs/heads/master c: 1bb933f h: refs/heads/master v: v3
git-mirror · May 20, 2011 · 9bc70da · 9bc70da
1 parent 52af1d5
commit 9bc70da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51ce65115642b77040f5582b8d2fc8815ac450f9
+refs/heads/master: 1bb933fb1fa8e4cb337a0d5dfd2ff4c0dc2073e8
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
@@ -2735,14 +2735,16 @@ static void ext4_remove_li_request(struct ext4_li_request *elr)
 
 static void ext4_unregister_li_request(struct super_block *sb)
 {
-	struct ext4_li_request *elr = EXT4_SB(sb)->s_li_request;
-
-	if (!ext4_li_info)
+	mutex_lock(&ext4_li_mtx);
+	if (!ext4_li_info) {
+		mutex_unlock(&ext4_li_mtx);
 		return;
+	}
 
 	mutex_lock(&ext4_li_info->li_list_mtx);
-	ext4_remove_li_request(elr);
+	ext4_remove_li_request(EXT4_SB(sb)->s_li_request);
 	mutex_unlock(&ext4_li_info->li_list_mtx);
+	mutex_unlock(&ext4_li_mtx);
 }
 
 static struct task_struct *ext4_lazyinit_task;