diff options
| author | Johann Latocha | 2012-02-02 01:13:50 +0100 |
|---|---|---|
| committer | Johann Latocha | 2012-02-02 01:13:50 +0100 |
| commit | 37e4ed696b77455a738fa948b93498c8740721bc (patch) | |
| tree | 14306f376ef7132d2cac1624e3aafa8dbba035b0 /src/kernel/blk.c | |
| parent | [SERVER] Close all client sockets on shutdown (diff) | |
| download | dnbd3-37e4ed696b77455a738fa948b93498c8740721bc.tar.gz dnbd3-37e4ed696b77455a738fa948b93498c8740721bc.tar.xz dnbd3-37e4ed696b77455a738fa948b93498c8740721bc.zip | |
[SERVER] Parsing config file with glib
[KERNEL] Bugfixes
[CLIENT] Using vid and rid
Diffstat (limited to 'src/kernel/blk.c')
| -rw-r--r-- | src/kernel/blk.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/kernel/blk.c b/src/kernel/blk.c index ccc45dc..c4bbeb1 100644 --- a/src/kernel/blk.c +++ b/src/kernel/blk.c @@ -31,6 +31,9 @@ int dnbd3_blk_add_device(dnbd3_device_t *dev, int minor) INIT_LIST_HEAD(&dev->request_queue_send); INIT_LIST_HEAD(&dev->request_queue_receive); + dev->vid = 0; + dev->rid = 0; + if (!(disk = alloc_disk(1))) { printk("ERROR: dnbd3 alloc_disk failed.\n"); @@ -92,18 +95,17 @@ int dnbd3_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, u case IOCTL_SET_HOST: strcpy(lo->host, (char *) arg); break; - case IOCTL_SET_PORT: strcpy(lo->port, (char *) arg); break; - case IOCTL_SET_IMAGE: - strcpy(lo->image_id, (char *) arg); + case IOCTL_SET_VID: + lo->vid = arg; + break; + case IOCTL_SET_RID: + lo->rid = arg; break; case IOCTL_CONNECT: - if (lo->host && lo->port && lo->image_id) - dnbd3_net_connect(lo); - else - return -1; + dnbd3_net_connect(lo); break; case IOCTL_DISCONNECT: dnbd3_net_disconnect(lo); |