---

yaml --- r: 188215 b: refs/heads/master c: 5168408 h: refs/heads/master i: 188213: 1e9bb60 188211: 40c84e4 188207: 177b444 v: v3
git-mirror · Mar 15, 2010 · 7476ba1 · 7476ba1
1 parent 252efd8
commit 7476ba1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4849f01d153be0f52b8191ee1be0ce492aa96811
+refs/heads/master: 51684082b11c304829ea22193d4d96a5b1663b97
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
@@ -325,16 +325,6 @@ static noinline int run_scheduled_bios(struct btrfs_device *device)
 		num_sync_run = 0;
 		blk_run_backing_dev(bdi, NULL);
 	}
-
-	cond_resched();
-	if (again)
-		goto loop;
-
-	spin_lock(&device->io_lock);
-	if (device->pending_bios.head || device->pending_sync_bios.head)
-		goto loop_lock;
-	spin_unlock(&device->io_lock);
-
 	/*
 	 * IO has already been through a long path to get here.  Checksumming,
 	 * async helper threads, perhaps compression.  We've done a pretty
@@ -346,6 +336,16 @@ static noinline int run_scheduled_bios(struct btrfs_device *device)
 	 * cared about found its way down here.
 	 */
 	blk_run_backing_dev(bdi, NULL);
+
+	cond_resched();
+	if (again)
+		goto loop;
+
+	spin_lock(&device->io_lock);
+	if (device->pending_bios.head || device->pending_sync_bios.head)
+		goto loop_lock;
+	spin_unlock(&device->io_lock);
+
 done:
 	return 0;
 }