diff options
| author | Joe Thornber <ejt@redhat.com> | 2012-07-27 10:08:06 -0400 |
|---|---|---|
| committer | Alasdair G Kergon <agk@redhat.com> | 2012-07-27 10:08:06 -0400 |
| commit | 8d44c98aac540cdf3cb5385bc6ef8d56930c7d70 (patch) | |
| tree | abc7ac2ad9e95a8110374596001c0af40db33683 /drivers/md | |
| parent | 600497013687516153cb82637acfe56f7eb9308a (diff) | |
dm persistent data: always unlock superblock in dm_bm_flush_and_unlock
Unlock the superblock even if initial dm_bufio_write_dirty_buffers fails.
Also, remove redundant flush calls. dm_bm_flush_and_unlock's calls to
dm_bufio_write_dirty_buffers already result in dm_bufio_issue_flush
being called.
This avoids warnings about unflushed dirty buffers from bufio.
Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/persistent-data/dm-block-manager.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c index 0317ecdc6e53..8ec46dd511f9 100644 --- a/drivers/md/persistent-data/dm-block-manager.c +++ b/drivers/md/persistent-data/dm-block-manager.c | |||
| @@ -587,22 +587,14 @@ int dm_bm_flush_and_unlock(struct dm_block_manager *bm, | |||
| 587 | int r; | 587 | int r; |
| 588 | 588 | ||
| 589 | r = dm_bufio_write_dirty_buffers(to_bufio(bm)); | 589 | r = dm_bufio_write_dirty_buffers(to_bufio(bm)); |
| 590 | if (unlikely(r)) | 590 | if (unlikely(r)) { |
| 591 | return r; | 591 | dm_bm_unlock(superblock); |
| 592 | r = dm_bufio_issue_flush(to_bufio(bm)); | ||
| 593 | if (unlikely(r)) | ||
| 594 | return r; | 592 | return r; |
| 593 | } | ||
| 595 | 594 | ||
| 596 | dm_bm_unlock(superblock); | 595 | dm_bm_unlock(superblock); |
| 597 | 596 | ||
| 598 | r = dm_bufio_write_dirty_buffers(to_bufio(bm)); | 597 | return dm_bufio_write_dirty_buffers(to_bufio(bm)); |
| 599 | if (unlikely(r)) | ||
| 600 | return r; | ||
| 601 | r = dm_bufio_issue_flush(to_bufio(bm)); | ||
| 602 | if (unlikely(r)) | ||
| 603 | return r; | ||
| 604 | |||
| 605 | return 0; | ||
| 606 | } | 598 | } |
| 607 | 599 | ||
| 608 | u32 dm_bm_checksum(const void *data, size_t len, u32 init_xor) | 600 | u32 dm_bm_checksum(const void *data, size_t len, u32 init_xor) |