lkml.org 
[lkml]   [2003]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] Re: [FWD: Bug in drivers/block/paride/pd.c]
On Mon, Aug 11, 2003 at 08:34:49PM -0400, A1tmblwd@netscape.net wrote:
> Hi, I sent this message to the original author; however, I am not certain that he is maintaining the code or is reachable at the address provided. Please forward to the appropriate party.

diff -urN B3-imajor/drivers/block/paride/pd.c B3-pd/drivers/block/paride/pd.c
--- B3-imajor/drivers/block/paride/pd.c Mon Jul 28 11:13:03 2003
+++ B3-pd/drivers/block/paride/pd.c Mon Aug 11 17:11:49 2003
@@ -654,7 +654,7 @@
return pd_identify(disk);
}

-static struct request_queue pd_queue;
+static struct request_queue *pd_queue;

static int pd_detect(void)
{
@@ -704,7 +704,7 @@
set_capacity(p, disk->capacity);
disk->gd = p;
p->private_data = disk;
- p->queue = &pd_queue;
+ p->queue = pd_queue;
add_disk(p);
}
}
@@ -782,7 +782,7 @@
spin_lock_irqsave(&pd_lock, saved_flags);
end_request(pd_req, success);
pd_busy = 0;
- do_pd_request(&pd_queue);
+ do_pd_request(pd_queue);
spin_unlock_irqrestore(&pd_lock, saved_flags);
}

@@ -890,20 +890,30 @@
{
if (disable)
return -1;
- if (register_blkdev(major, name))
- return -1;

- blk_init_queue(&pd_queue, do_pd_request, &pd_lock);
- blk_queue_max_sectors(&pd_queue, cluster);
+ pd_queue = blk_init_queue(do_pd_request, &pd_lock);
+ if (!pd_queue)
+ goto out1;
+
+ blk_queue_max_sectors(pd_queue, cluster);
+
+ if (register_blkdev(major, name))
+ goto out2;

printk("%s: %s version %s, major %d, cluster %d, nice %d\n",
name, name, PD_VERSION, major, cluster, nice);
pd_init_units();
- if (!pd_detect()) {
- unregister_blkdev(major, name);
- return -1;
- }
+ if (!pd_detect())
+ goto out3;
+
return 0;
+
+out3:
+ unregister_blkdev(major, name);
+out2:
+ blk_cleanup_queue(pd_queue);
+out1:
+ return -1;
}

static void __exit pd_exit(void)
@@ -920,7 +930,7 @@
pi_release(disk->pi);
}
}
- blk_cleanup_queue(&pd_queue);
+ blk_cleanup_queue(pd_queue);
}

MODULE_LICENSE("GPL");
-
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:47    [W:0.044 / U:2.956 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site