---

yaml --- r: 319480 b: refs/heads/master c: 8d44c98 h: refs/heads/master v: v3
git-mirror · Jul 27, 2012 · 0dbe60a · 0dbe60a
1 parent 22ab821
commit 0dbe60a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 600497013687516153cb82637acfe56f7eb9308a
+refs/heads/master: 8d44c98aac540cdf3cb5385bc6ef8d56930c7d70
diff --git a/trunk/drivers/md/persistent-data/dm-block-manager.c b/trunk/drivers/md/persistent-data/dm-block-manager.c
@@ -587,22 +587,14 @@ int dm_bm_flush_and_unlock(struct dm_block_manager *bm,
 	int r;
 
 	r = dm_bufio_write_dirty_buffers(to_bufio(bm));
-	if (unlikely(r))
-		return r;
-	r = dm_bufio_issue_flush(to_bufio(bm));
-	if (unlikely(r))
+	if (unlikely(r)) {
+		dm_bm_unlock(superblock);
 		return r;
+	}
 
 	dm_bm_unlock(superblock);
 
-	r = dm_bufio_write_dirty_buffers(to_bufio(bm));
-	if (unlikely(r))
-		return r;
-	r = dm_bufio_issue_flush(to_bufio(bm));
-	if (unlikely(r))
-		return r;
-
-	return 0;
+	return dm_bufio_write_dirty_buffers(to_bufio(bm));
 }
 
 u32 dm_bm_checksum(const void *data, size_t len, u32 init_xor)