mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	block: fix and cleanup bio_check_ro
Don't use a WARN_ON when printing a potentially user triggered condition. Also don't print the partno when the block device name already includes it, and use the %pg specifier to simplify printing the block device name. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Link: https://lore.kernel.org/r/20220304180105.409765-2-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
		
							parent
							
								
									ab552fcb17
								
							
						
					
					
						commit
						57e95e4670
					
				
					 1 changed files with 2 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -580,14 +580,10 @@ late_initcall(fail_make_request_debugfs);
 | 
			
		|||
static inline bool bio_check_ro(struct bio *bio)
 | 
			
		||||
{
 | 
			
		||||
	if (op_is_write(bio_op(bio)) && bdev_read_only(bio->bi_bdev)) {
 | 
			
		||||
		char b[BDEVNAME_SIZE];
 | 
			
		||||
 | 
			
		||||
		if (op_is_flush(bio->bi_opf) && !bio_sectors(bio))
 | 
			
		||||
			return false;
 | 
			
		||||
 | 
			
		||||
		WARN_ONCE(1,
 | 
			
		||||
		       "Trying to write to read-only block-device %s (partno %d)\n",
 | 
			
		||||
			bio_devname(bio, b), bio->bi_bdev->bd_partno);
 | 
			
		||||
		pr_warn("Trying to write to read-only block-device %pg\n",
 | 
			
		||||
			bio->bi_bdev);
 | 
			
		||||
		/* Older lvm-tools actually trigger this */
 | 
			
		||||
		return false;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue