From: Pavel Machek <pavel@ucw.cz>
To: Rusty trivial patch monkey Russell <trivial@rustcorp.com.au>,
kernel list <linux-kernel@vger.kernel.org>
Subject: Clean up nbd.c
Date: Mon, 21 Oct 2002 11:52:54 +0200 [thread overview]
Message-ID: <20021021095254.GA8811@elf.ucw.cz> (raw)
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?
reply other threads:[~2002-10-26 10:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20021021095254.GA8811@elf.ucw.cz \
--to=pavel@ucw.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=trivial@rustcorp.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®