Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 610827de authored by Peter Osterlund's avatar Peter Osterlund Committed by Linus Torvalds
Browse files

[PATCH] pktcdvd: BUG_ON cleanups 



Remove some redundant BUG_ON() statements in pktcdvd and move one run-time
check to compile-time.

Signed-off-by: default avatarPeter Osterlund <petero2@telia.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1107d2e0

drivers/block/pktcdvd.c

+3 −6
Original line number Diff line number Diff line
@@ -669,7 +669,6 @@ static void pkt_make_local_copy(struct packet_data *pkt, struct page **pages, in 
		}

		offs += CD_FRAMESIZE;

		if (offs >= PAGE_SIZE) {

			BUG_ON(offs > PAGE_SIZE);

			offs = 0;

			p++;

		}
@@ -804,10 +803,11 @@ static struct packet_data *pkt_get_packet_data(struct pktcdvd_device *pd, int zo 
			list_del_init(&pkt->list);

			if (pkt->sector != zone)

				pkt->cache_valid = 0;

			break;

			return pkt;

		}

	}

	return pkt;

	BUG();

	return NULL;

}



static void pkt_put_packet_data(struct pktcdvd_device *pd, struct packet_data *pkt)
@@ -951,7 +951,6 @@ static int pkt_handle_queue(struct pktcdvd_device *pd) 
	}



	pkt = pkt_get_packet_data(pd, zone);

	BUG_ON(!pkt);



	pd->current_sector = zone + pd->settings.size;

	pkt->sector = zone;
@@ -2211,7 +2210,6 @@ static int pkt_make_request(request_queue_t *q, struct bio *bio) 
	 * No matching packet found. Store the bio in the work queue.

	 */

	node = mempool_alloc(pd->rb_pool, GFP_NOIO);

	BUG_ON(!node);

	node->bio = bio;

	spin_lock(&pd->lock);

	BUG_ON(pd->bio_queue_size < 0);
@@ -2419,7 +2417,6 @@ static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u 
	struct pktcdvd_device *pd = inode->i_bdev->bd_disk->private_data;



	VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode));

	BUG_ON(!pd);



	switch (cmd) {

	/*

include/linux/pktcdvd.h

+3 −0
Original line number Diff line number Diff line
@@ -166,6 +166,9 @@ struct packet_iosched 
/*

 * 32 buffers of 2048 bytes

 */

#if (PAGE_SIZE % CD_FRAMESIZE) != 0

#error "PAGE_SIZE must be a multiple of CD_FRAMESIZE"

#endif

#define PACKET_MAX_SIZE		32

#define PAGES_PER_PACKET	(PACKET_MAX_SIZE * CD_FRAMESIZE / PAGE_SIZE)

#define PACKET_MAX_SECTORS	(PACKET_MAX_SIZE * CD_FRAMESIZE >> 9)