---

yaml --- r: 207599 b: refs/heads/master c: 4f331f0 h: refs/heads/master i: 207597: 457c837 207595: 308051d 207591: caebb83 207583: 42f1651 v: v3
git-mirror · Aug 9, 2010 · 1786822 · 1786822
1 parent 7867197
commit 1786822
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 719f2c879f4dda7d7f303bd387d37cd96db29d31
+refs/heads/master: 4f331f01b9c43bf001d3ffee578a97a1e0633eac
diff --git a/trunk/fs/super.c b/trunk/fs/super.c
@@ -773,7 +773,16 @@ int get_sb_bdev(struct file_system_type *fs_type,
 			goto error_bdev;
 		}
 
+		/*
+		 * s_umount nests inside bd_mutex during
+		 * __invalidate_device().  close_bdev_exclusive()
+		 * acquires bd_mutex and can't be called under
+		 * s_umount.  Drop s_umount temporarily.  This is safe
+		 * as we're holding an active reference.
+		 */
+		up_write(&s->s_umount);
 		close_bdev_exclusive(bdev, mode);
+		down_write(&s->s_umount);
 	} else {
 		char b[BDEVNAME_SIZE];