mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	btrfs: relocation: use more natural types for tree_block bitfields
We don't need to use bitfields for tree_block::level and tree_block::key_ready, there's enough padding in the structure for proper types. Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
		
							parent
							
								
									1723270f0c
								
							
						
					
					
						commit
						a3bb700f43
					
				
					 1 changed files with 4 additions and 4 deletions
				
			
		| 
						 | 
					@ -111,8 +111,8 @@ struct tree_block {
 | 
				
			||||||
	}; /* Use rb_simple_node for search/insert */
 | 
						}; /* Use rb_simple_node for search/insert */
 | 
				
			||||||
	u64 owner;
 | 
						u64 owner;
 | 
				
			||||||
	struct btrfs_key key;
 | 
						struct btrfs_key key;
 | 
				
			||||||
	unsigned int level:8;
 | 
						u8 level;
 | 
				
			||||||
	unsigned int key_ready:1;
 | 
						bool key_ready;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define MAX_EXTENTS 128
 | 
					#define MAX_EXTENTS 128
 | 
				
			||||||
| 
						 | 
					@ -2664,7 +2664,7 @@ static int get_tree_block_key(struct btrfs_fs_info *fs_info,
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		btrfs_node_key_to_cpu(eb, &block->key, 0);
 | 
							btrfs_node_key_to_cpu(eb, &block->key, 0);
 | 
				
			||||||
	free_extent_buffer(eb);
 | 
						free_extent_buffer(eb);
 | 
				
			||||||
	block->key_ready = 1;
 | 
						block->key_ready = true;
 | 
				
			||||||
	return 0;
 | 
						return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3313,7 +3313,7 @@ static int add_tree_block(struct reloc_control *rc,
 | 
				
			||||||
	block->key.objectid = rc->extent_root->fs_info->nodesize;
 | 
						block->key.objectid = rc->extent_root->fs_info->nodesize;
 | 
				
			||||||
	block->key.offset = generation;
 | 
						block->key.offset = generation;
 | 
				
			||||||
	block->level = level;
 | 
						block->level = level;
 | 
				
			||||||
	block->key_ready = 0;
 | 
						block->key_ready = false;
 | 
				
			||||||
	block->owner = owner;
 | 
						block->owner = owner;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	rb_node = rb_simple_insert(blocks, block->bytenr, &block->rb_node);
 | 
						rb_node = rb_simple_insert(blocks, block->bytenr, &block->rb_node);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue