git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
block
/
pktcdvd.c
diff --git
a/drivers/block/pktcdvd.c
b/drivers/block/pktcdvd.c
index
03a9388
..
7590000
100644
(file)
--- a/
drivers/block/pktcdvd.c
+++ b/
drivers/block/pktcdvd.c
@@
-135,12
+135,10
@@
static struct packet_data *pkt_alloc_packet_data(void)
goto no_bio;
for (i = 0; i < PAGES_PER_PACKET; i++) {
goto no_bio;
for (i = 0; i < PAGES_PER_PACKET; i++) {
- pkt->pages[i] = alloc_page(GFP_KERNEL);
+ pkt->pages[i] = alloc_page(GFP_KERNEL
|__GFP_ZERO
);
if (!pkt->pages[i])
goto no_page;
}
if (!pkt->pages[i])
goto no_page;
}
- for (i = 0; i < PAGES_PER_PACKET; i++)
- clear_page(page_address(pkt->pages[i]));
spin_lock_init(&pkt->lock);
spin_lock_init(&pkt->lock);
@@
-607,8
+605,7
@@
static int pkt_set_segment_merging(struct pktcdvd_device *pd, request_queue_t *q
/*
* Copy CD_FRAMESIZE bytes from src_bio into a destination page
*/
/*
* Copy CD_FRAMESIZE bytes from src_bio into a destination page
*/
-static void pkt_copy_bio_data(struct bio *src_bio, int seg, int offs,
- struct page *dst_page, int dst_offs)
+static void pkt_copy_bio_data(struct bio *src_bio, int seg, int offs, struct page *dst_page, int dst_offs)
{
unsigned int copy_size = CD_FRAMESIZE;
{
unsigned int copy_size = CD_FRAMESIZE;
@@
-1301,8
+1298,7
@@
static void pkt_print_settings(struct pktcdvd_device *pd)
printk("Mode-%c disc\n", pd->settings.block_mode == 8 ? '1' : '2');
}
printk("Mode-%c disc\n", pd->settings.block_mode == 8 ? '1' : '2');
}
-static int pkt_mode_sense(struct pktcdvd_device *pd, struct packet_command *cgc,
- int page_code, int page_control)
+static int pkt_mode_sense(struct pktcdvd_device *pd, struct packet_command *cgc, int page_code, int page_control)
{
memset(cgc->cmd, 0, sizeof(cgc->cmd));
{
memset(cgc->cmd, 0, sizeof(cgc->cmd));
@@
-2627,7
+2623,7
@@
static struct miscdevice pkt_misc = {
.fops = &pkt_ctl_fops
};
.fops = &pkt_ctl_fops
};
-int pkt_init(void)
+
static
int pkt_init(void)
{
int ret;
{
int ret;
@@
-2663,7
+2659,7
@@
out2:
return ret;
}
return ret;
}
-void pkt_exit(void)
+
static
void pkt_exit(void)
{
remove_proc_entry("pktcdvd", proc_root_driver);
misc_deregister(&pkt_misc);
{
remove_proc_entry("pktcdvd", proc_root_driver);
misc_deregister(&pkt_misc);