lkml.org 
[lkml]   [2002]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectClean up nbd.c
Hi!

I've never seen any of those errors, so I guess its okay to convert
them to BUG_ONs. It makes code look better [I'm nbd
maintainer, and approve it ;-)]. Please apply,

Pavel

--- clean/drivers/block/nbd.c 2002-10-20 16:22:38.000000000 +0200
+++ linux/drivers/block/nbd.c 2002-10-20 18:25:41.000000000 +0200
@@ -65,10 +65,8 @@
/* #define DEBUG( s ) printk( s )
*/

-#ifdef PARANOIA
static int requests_in;
static int requests_out;
-#endif

static int nbd_open(struct inode *inode, struct file *file)
{
@@ -261,18 +259,8 @@
printk(KERN_ALERT "req should never be null\n" );
goto out;
}
-#ifdef PARANOIA
- if (lo != req->rq_disk->private_data) {
- printk(KERN_ALERT "NBD: request corrupted!\n");
- continue;
- }
- if (lo->magic != LO_MAGIC) {
- printk(KERN_ALERT "NBD: nbd_dev[] corrupted: Not enough magic\n");
- goto out;
- }
-#endif
+ BUG_ON(lo->magic != LO_MAGIC);
nbd_end_request(req);
-
}
out:
return;
@@ -282,12 +270,7 @@
{
struct request *req;

-#ifdef PARANOIA
- if (lo->magic != LO_MAGIC) {
- printk(KERN_ERR "NBD: nbd_dev[] corrupted: Not enough magic when clearing!\n");
- return;
- }
-#endif
+ BUG_ON(lo->magic != LO_MAGIC);

do {
req = NULL;
@@ -333,11 +316,9 @@
if (lo->flags & NBD_READ_ONLY)
FAIL("Write on read-only");
}
-#ifdef PARANOIA
- if (lo->magic != LO_MAGIC)
- FAIL("nbd[] is not magical!");
+ BUG_ON(lo->magic != LO_MAGIC);
requests_in++;
-#endif
+
req->errors = 0;
blkdev_dequeue_request(req);
spin_unlock_irq(q->queue_lock);
--
Worst form of spam? Adding advertisment signatures ala sourceforge.net.
What goes next? Inserting advertisment *into* email?
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:30    [W:0.042 / U:0.244 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site