Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block

[mv-sheeva.git] / drivers / block / pktcdvd.c

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 044b84e6f147934e20fea84249ed1a18d1d8bfb9..19b3568e9326303543c8ace464361637aadc6ef8 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -753,7 +753,6 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
 
        rq->timeout = 60*HZ;
        rq->cmd_type = REQ_TYPE_BLOCK_PC;
-       rq->cmd_flags |= REQ_HARDBARRIER;
        if (cgc->quiet)
                rq->cmd_flags |= REQ_QUIET;
 
@@ -3046,6 +3045,7 @@ static const struct file_operations pkt_ctl_fops = {
        .compat_ioctl   = pkt_ctl_compat_ioctl,
 #endif
        .owner          = THIS_MODULE,
+       .llseek         = no_llseek,
 };
 
 static struct miscdevice pkt_misc = {