block: clear dirty bitmap when discarding
Note that resetting bits in the dirty bitmap is done _before_ actually processing the request. Writes, instead, set bits after the request is completed. This way, when there are concurrent write and discard requests, the outcome will always be that the blocks are marked dirty. This scenario should never happen, but it is safer to do it this way. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
		
							parent
							
								
									501378c3af
								
							
						
					
					
						commit
						df702c9b4c
					
				
							
								
								
									
										8
									
								
								block.c
								
								
								
								
							
							
						
						
									
										8
									
								
								block.c
								
								
								
								
							| 
						 | 
				
			
			@ -4170,7 +4170,13 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num,
 | 
			
		|||
        return -EIO;
 | 
			
		||||
    } else if (bs->read_only) {
 | 
			
		||||
        return -EROFS;
 | 
			
		||||
    } else if (bs->drv->bdrv_co_discard) {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (bs->dirty_bitmap) {
 | 
			
		||||
        set_dirty_bitmap(bs, sector_num, nb_sectors, 0);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (bs->drv->bdrv_co_discard) {
 | 
			
		||||
        return bs->drv->bdrv_co_discard(bs, sector_num, nb_sectors);
 | 
			
		||||
    } else if (bs->drv->bdrv_aio_discard) {
 | 
			
		||||
        BlockDriverAIOCB *acb;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue