dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Joe Thornber 2012-07-27 15:08:06 +01:00 committed by Alasdair G Kergon
parent 6004970136
commit 8d44c98aac
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/md/persistent-data/dm-block-manager.c
View File

@ -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)