summaryrefslogtreecommitdiffstats
path: root/src/kernel/blk.c
diff options
context:
space:
mode:
authorJohann Latocha2012-02-22 17:24:45 +0100
committerJohann Latocha2012-02-22 17:24:45 +0100
commit826ade8c69c69a0b25071092c674938bc297f0bf (patch)
treeb0f79816da1acaee0bde5e06885b1f123a651609 /src/kernel/blk.c
parent[SERVER] Segfault on conf reload (hopefully!) fixed (diff)
downloaddnbd3-826ade8c69c69a0b25071092c674938bc297f0bf.tar.gz
dnbd3-826ade8c69c69a0b25071092c674938bc297f0bf.tar.xz
dnbd3-826ade8c69c69a0b25071092c674938bc297f0bf.zip
[ALL] Bugs, bugs, bugs...
Diffstat (limited to 'src/kernel/blk.c')
-rw-r--r--src/kernel/blk.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/kernel/blk.c b/src/kernel/blk.c
index 70d4e1f..1023743 100644
--- a/src/kernel/blk.c
+++ b/src/kernel/blk.c
@@ -95,8 +95,6 @@ struct block_device_operations dnbd3_blk_ops =
int dnbd3_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg)
{
dnbd3_device_t *dev = bdev->bd_disk->private_data;
- int minor = dev->disk->first_minor;
-
dnbd3_ioctl_t *msg = kmalloc(sizeof(dnbd3_ioctl_t), GFP_KERNEL);
copy_from_user((char *)msg, (char *)arg, sizeof(*msg));
@@ -111,9 +109,8 @@ int dnbd3_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, u
break;
case IOCTL_CLOSE:
+ set_capacity(dev->disk, 0);
dnbd3_net_disconnect(dev);
- dnbd3_blk_del_device(dev);
- dnbd3_blk_add_device(dev, minor);
break;
case IOCTL_SWITCH: