From f8796a187ecd7ca50f25b4660aedd279eca4d6ab Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 30 Nov 2008 01:33:57 -0500 Subject: [PATCH] --- yaml --- r: 119727 b: refs/heads/master c: 2cbed8906fd1f3c6cc17cdf8aac1bfad2da7960c h: refs/heads/master i: 119725: da993aea943d9581b6f9f404b02decbccfe2d4c3 119723: c42e53443864b351b7c1353e5d8c38686dc07423 119719: 24d7de6ca061ccf4a8e9bac42da5d5ac3397ef91 119711: 88221f033aff4f19e21b49374df8b0ee5619c31e v: v3 --- [refs] | 2 +- trunk/drivers/block/pktcdvd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index be6ae782f67b..d2e355dfdec7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc9161e54d0dbf799beff9692ea1cc6237162b85 +refs/heads/master: 2cbed8906fd1f3c6cc17cdf8aac1bfad2da7960c diff --git a/trunk/drivers/block/pktcdvd.c b/trunk/drivers/block/pktcdvd.c index f20bf359b84f..edda7b6b077b 100644 --- a/trunk/drivers/block/pktcdvd.c +++ b/trunk/drivers/block/pktcdvd.c @@ -2790,7 +2790,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) return 0; out_mem: - blkdev_put(bdev, FMODE_READ|FMODE_WRITE); + blkdev_put(bdev, FMODE_READ | FMODE_NDELAY); /* This is safe: open() is still holding a reference. */ module_put(THIS_MODULE); return ret; @@ -2975,7 +2975,7 @@ static int pkt_remove_dev(dev_t pkt_dev) pkt_debugfs_dev_remove(pd); pkt_sysfs_dev_remove(pd); - blkdev_put(pd->bdev, FMODE_READ|FMODE_WRITE); + blkdev_put(pd->bdev, FMODE_READ | FMODE_NDELAY); remove_proc_entry(pd->name, pkt_proc); DPRINTK(DRIVER_NAME": writer %s unmapped\n", pd->name);