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>
This commit is contained in:
		
					parent
					
						
							
								0184b44e32
							
						
					
				
			
			
				commit
				
					
						dd8b0c2096
					
				
			
		
					 1 changed files with 5 additions and 4 deletions
				
			
		| 
						 | 
					@ -198,7 +198,7 @@ static int superblock_lock(struct dm_cache_metadata *cmd,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*----------------------------------------------------------------*/
 | 
					/*----------------------------------------------------------------*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __superblock_all_zeroes(struct dm_block_manager *bm, int *result)
 | 
					static int __superblock_all_zeroes(struct dm_block_manager *bm, bool *result)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int r;
 | 
						int r;
 | 
				
			||||||
	unsigned i;
 | 
						unsigned i;
 | 
				
			||||||
| 
						 | 
					@ -214,10 +214,10 @@ static int __superblock_all_zeroes(struct dm_block_manager *bm, int *result)
 | 
				
			||||||
		return r;
 | 
							return r;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	data_le = dm_block_data(b);
 | 
						data_le = dm_block_data(b);
 | 
				
			||||||
	*result = 1;
 | 
						*result = true;
 | 
				
			||||||
	for (i = 0; i < sb_block_size; i++) {
 | 
						for (i = 0; i < sb_block_size; i++) {
 | 
				
			||||||
		if (data_le[i] != zero) {
 | 
							if (data_le[i] != zero) {
 | 
				
			||||||
			*result = 0;
 | 
								*result = false;
 | 
				
			||||||
			break;
 | 
								break;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
| 
						 | 
					@ -411,7 +411,8 @@ bad:
 | 
				
			||||||
static int __open_or_format_metadata(struct dm_cache_metadata *cmd,
 | 
					static int __open_or_format_metadata(struct dm_cache_metadata *cmd,
 | 
				
			||||||
				     bool format_device)
 | 
									     bool format_device)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int r, unformatted;
 | 
						int r;
 | 
				
			||||||
 | 
						bool unformatted = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	r = __superblock_all_zeroes(cmd->bm, &unformatted);
 | 
						r = __superblock_all_zeroes(cmd->bm, &unformatted);
 | 
				
			||||||
	if (r)
 | 
						if (r)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue