1 --- linux-2.6.1-rc1/drivers/cdrom/cdrom.c~ 2004-01-05 11:10:12.959452528 +0100
2 +++ linux-2.6.1-rc1/drivers/cdrom/cdrom.c 2004-01-05 11:15:10.536213984 +0100
5 cdinfo(CD_OPEN, "entering cdrom_open\n");
8 - if (fp->f_mode & FMODE_WRITE) {
9 - printk("cdrom: %s opening for WRITE\n", current->comm);
10 - if (!CDROM_CAN(CDC_RAM)) {
14 - if (cdrom_open_write(cdi))
18 /* if this was a O_NONBLOCK open and we should honor the flags,
19 * do a quick open without drive/disc integrity checks. */
20 if ((fp->f_flags & O_NONBLOCK) && (cdi->options & CDO_USE_FFLAGS))
21 ret = cdi->ops->open(cdi, 1);
24 + if (fp->f_mode & FMODE_WRITE) {
26 + printk("cdrom: %s opening for WRITE\n", current->comm);
27 + if (!CDROM_CAN(CDC_RAM)) {
31 + if (cdrom_open_write(cdi))
34 ret = open_for_data(cdi);
37 cdinfo(CD_OPEN, "Use count for \"/dev/%s\" now %d\n", cdi->name, cdi->use_count);
38 /* Do this on open. Don't wait for mount, because they might