Merge branch 'master' into develop
This commit is contained in:
		
						commit
						c33afd1032
					
				
							
								
								
									
										2
									
								
								zpool.c
								
								
								
								
							
							
						
						
									
										2
									
								
								zpool.c
								
								
								
								
							| 
						 | 
				
			
			@ -193,7 +193,7 @@ property_list_ptr read_zpool_property(zpool_list_ptr pool, int prop) {
 | 
			
		|||
	property_list_ptr list = new_property_list();
 | 
			
		||||
 | 
			
		||||
	r = zpool_get_prop(pool->zph, prop,
 | 
			
		||||
		list->value, INT_MAX_VALUE, &source, B_FALSE);
 | 
			
		||||
		list->value, INT_MAX_VALUE, &source, B_TRUE);
 | 
			
		||||
	if (r == 0) {
 | 
			
		||||
		// strcpy(list->name, zpool_prop_to_name(prop));
 | 
			
		||||
		zprop_source_tostr(list->source, source);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue