pktcdvd.c (9ff17e6bdaa50892dd9bdb1b116cb71b73dd711a) pktcdvd.c (0718afd47f70cf46877c39c25d06b786e1a3f36c)
1/*
2 * Copyright (C) 2000 Jens Axboe <axboe@suse.de>
3 * Copyright (C) 2001-2004 Peter Osterlund <petero2@telia.com>
4 * Copyright (C) 2006 Thomas Maier <balagi@justmail.de>
5 *
6 * May be copied or modified under the terms of the GNU General Public
7 * License. See linux/COPYING for more information.
8 *

--- 2111 unchanged lines hidden (view full) ---

2120 struct request_queue *q;
2121 struct block_device *bdev;
2122
2123 /*
2124 * We need to re-open the cdrom device without O_NONBLOCK to be able
2125 * to read/write from/to it. It is already opened in O_NONBLOCK mode
2126 * so open should not fail.
2127 */
1/*
2 * Copyright (C) 2000 Jens Axboe <axboe@suse.de>
3 * Copyright (C) 2001-2004 Peter Osterlund <petero2@telia.com>
4 * Copyright (C) 2006 Thomas Maier <balagi@justmail.de>
5 *
6 * May be copied or modified under the terms of the GNU General Public
7 * License. See linux/COPYING for more information.
8 *

--- 2111 unchanged lines hidden (view full) ---

2120 struct request_queue *q;
2121 struct block_device *bdev;
2122
2123 /*
2124 * We need to re-open the cdrom device without O_NONBLOCK to be able
2125 * to read/write from/to it. It is already opened in O_NONBLOCK mode
2126 * so open should not fail.
2127 */
2128 bdev = blkdev_get_by_dev(pd->bdev->bd_dev, FMODE_READ | FMODE_EXCL, pd);
2128 bdev = blkdev_get_by_dev(pd->bdev->bd_dev, FMODE_READ | FMODE_EXCL, pd,
2129 NULL);
2129 if (IS_ERR(bdev)) {
2130 ret = PTR_ERR(bdev);
2131 goto out;
2132 }
2133
2134 ret = pkt_get_last_written(pd, &lba);
2135 if (ret) {
2136 pkt_err(pd, "pkt_get_last_written failed\n");

--- 388 unchanged lines hidden (view full) ---

2525 return -EBUSY;
2526 }
2527 if (pd2->pkt_dev == dev) {
2528 pkt_err(pd, "can't chain pktcdvd devices\n");
2529 return -EBUSY;
2530 }
2531 }
2532
2130 if (IS_ERR(bdev)) {
2131 ret = PTR_ERR(bdev);
2132 goto out;
2133 }
2134
2135 ret = pkt_get_last_written(pd, &lba);
2136 if (ret) {
2137 pkt_err(pd, "pkt_get_last_written failed\n");

--- 388 unchanged lines hidden (view full) ---

2526 return -EBUSY;
2527 }
2528 if (pd2->pkt_dev == dev) {
2529 pkt_err(pd, "can't chain pktcdvd devices\n");
2530 return -EBUSY;
2531 }
2532 }
2533
2533 bdev = blkdev_get_by_dev(dev, FMODE_READ | FMODE_NDELAY, NULL);
2534 bdev = blkdev_get_by_dev(dev, FMODE_READ | FMODE_NDELAY, NULL, NULL);
2534 if (IS_ERR(bdev))
2535 return PTR_ERR(bdev);
2536 sdev = scsi_device_from_queue(bdev->bd_disk->queue);
2537 if (!sdev) {
2538 blkdev_put(bdev, FMODE_READ | FMODE_NDELAY);
2539 return -EINVAL;
2540 }
2541 put_device(&sdev->sdev_gendev);

--- 393 unchanged lines hidden --- 		2535 if (IS_ERR(bdev))
2536 return PTR_ERR(bdev);
2537 sdev = scsi_device_from_queue(bdev->bd_disk->queue);
2538 if (!sdev) {
2539 blkdev_put(bdev, FMODE_READ | FMODE_NDELAY);
2540 return -EINVAL;
2541 }
2542 put_device(&sdev->sdev_gendev);

--- 393 unchanged lines hidden ---