Commit 90a2326e authored by Mike Snitzer's avatar Mike Snitzer
Browse files

dm: reduce code duplication in __map_bio 



Error path code (for handling DM_MAPIO_REQUEUE and DM_MAPIO_KILL) is
effectively identical.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent d41e077a

drivers/md/dm.c

+6 −12
Original line number Diff line number Diff line
@@ -1180,19 +1180,13 @@ static void __map_bio(struct bio *clone) 
		submit_bio_noacct(clone);

		break;

	case DM_MAPIO_KILL:

		if (unlikely(swap_bios_limit(ti, clone))) {

			struct mapped_device *md = io->md;

			up(&md->swap_bios_semaphore);

		}

		free_tio(clone);

		dm_io_dec_pending(io, BLK_STS_IOERR);

		break;

	case DM_MAPIO_REQUEUE:

		if (unlikely(swap_bios_limit(ti, clone))) {

			struct mapped_device *md = io->md;

			up(&md->swap_bios_semaphore);

		}

		if (unlikely(swap_bios_limit(ti, clone)))

			up(&io->md->swap_bios_semaphore);

		free_tio(clone);

		if (r == DM_MAPIO_KILL)

			dm_io_dec_pending(io, BLK_STS_IOERR);

		else

			dm_io_dec_pending(io, BLK_STS_DM_REQUEUE);

		break;

	default: