diff options
author | Joe Thornber <ejt@redhat.com> | 2013-10-24 14:10:28 -0400 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2013-11-09 18:20:17 -0500 |
commit | dd8b0c2096e53b336324e99455efcc498599ba0f (patch) | |
tree | 93b1ee6c908a4a651082aecaebac61a8dddadb2f /drivers | |
parent | 0184b44e321dda893d4d4be33499d404718c3a86 (diff) |
dm cache metadata: return bool from __superblock_all_zeroes
Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/md/dm-cache-metadata.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/md/dm-cache-metadata.c b/drivers/md/dm-cache-metadata.c index 1af7255bbffb..2262b4e57a28 100644 --- a/drivers/md/dm-cache-metadata.c +++ b/drivers/md/dm-cache-metadata.c | |||
@@ -198,7 +198,7 @@ static int superblock_lock(struct dm_cache_metadata *cmd, | |||
198 | 198 | ||
199 | /*----------------------------------------------------------------*/ | 199 | /*----------------------------------------------------------------*/ |
200 | 200 | ||
201 | static int __superblock_all_zeroes(struct dm_block_manager *bm, int *result) | 201 | static int __superblock_all_zeroes(struct dm_block_manager *bm, bool *result) |
202 | { | 202 | { |
203 | int r; | 203 | int r; |
204 | unsigned i; | 204 | unsigned i; |
@@ -214,10 +214,10 @@ static int __superblock_all_zeroes(struct dm_block_manager *bm, int *result) | |||
214 | return r; | 214 | return r; |
215 | 215 | ||
216 | data_le = dm_block_data(b); | 216 | data_le = dm_block_data(b); |
217 | *result = 1; | 217 | *result = true; |
218 | for (i = 0; i < sb_block_size; i++) { | 218 | for (i = 0; i < sb_block_size; i++) { |
219 | if (data_le[i] != zero) { | 219 | if (data_le[i] != zero) { |
220 | *result = 0; | 220 | *result = false; |
221 | break; | 221 | break; |
222 | } | 222 | } |
223 | } | 223 | } |
@@ -411,7 +411,8 @@ bad: | |||
411 | static int __open_or_format_metadata(struct dm_cache_metadata *cmd, | 411 | static int __open_or_format_metadata(struct dm_cache_metadata *cmd, |
412 | bool format_device) | 412 | bool format_device) |
413 | { | 413 | { |
414 | int r, unformatted; | 414 | int r; |
415 | bool unformatted = false; | ||
415 | 416 | ||
416 | r = __superblock_all_zeroes(cmd->bm, &unformatted); | 417 | r = __superblock_all_zeroes(cmd->bm, &unformatted); |
417 | if (r) | 418 | if (r) |