fix get_active_super()/umount() race

[deliverable/linux.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index 4df8233dfb61fa28b6d18611fdbb23ed93b607cf..44971d7df1cecc47ca33d8320b26c1bb6f4b7bd7 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -471,17 +471,17 @@ struct super_block *get_active_super(struct block_device *bdev)
        if (!bdev)
                return NULL;
 
+restart:
        spin_lock(&sb_lock);
        list_for_each_entry(sb, &super_blocks, s_list) {
                if (list_empty(&sb->s_instances))
                        continue;
-               if (sb->s_bdev != bdev)
-                       continue;
-
-               if (grab_super(sb)) /* drops sb_lock */
-                       return sb;
-
-               spin_lock(&sb_lock);
+               if (sb->s_bdev == bdev) {
+                       if (grab_super(sb)) /* drops sb_lock */
+                               return sb;
+                       else
+                               goto restart;
+               }
        }
        spin_unlock(&sb_lock);
        return NULL;