Merge tag 'pull-set_blocksize' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / drivers / block / pktcdvd.c

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 21728e9ea5c374603b50b758282d9091329e2e82..8a2ce80700109dfad85fe5d314319d675f3e0edb 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2215,6 +2215,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, bool write)
                }
                dev_info(ddev, "%lukB available on disc\n", lba << 1);
        }
+       set_blocksize(bdev_file, CD_FRAMESIZE);
 
        return 0;
 
@@ -2278,11 +2279,6 @@ static int pkt_open(struct gendisk *disk, blk_mode_t mode)
                ret = pkt_open_dev(pd, mode & BLK_OPEN_WRITE);
                if (ret)
                        goto out_dec;
-               /*
-                * needed here as well, since ext2 (among others) may change
-                * the blocksize at mount time
-                */
-               set_blocksize(disk->part0, CD_FRAMESIZE);
        }
        mutex_unlock(&ctl_mutex);
        mutex_unlock(&pktcdvd_mutex);
@@ -2526,7 +2522,6 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
        __module_get(THIS_MODULE);
 
        pd->bdev_file = bdev_file;
-       set_blocksize(file_bdev(bdev_file), CD_FRAMESIZE);
 
        atomic_set(&pd->cdrw.pending_bios, 0);
        pd->cdrw.thread = kthread_run(kcdrwd, pd, "%s", pd->disk->disk_name);