diff options
| author | Simon Rettberg | 2013-11-12 16:39:04 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-11-12 16:39:04 +0100 |
| commit | 080d2c7799e7d2e3a1378bc94c7d530542a75539 (patch) | |
| tree | 4f1f8ce5c697f961dbc53a27669a57297f5e8ea1 /src/kernel/blk.c | |
| parent | [SERVER] Fix embarrassing deadlock when deleting old images (diff) | |
| parent | tiny fix (diff) | |
| download | dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.tar.gz dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.tar.xz dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.zip | |
Merge branch 'simon' of dnbd3:dnbd3 into simon
Conflicts:
src/server/altservers.c
Diffstat (limited to 'src/kernel/blk.c')
| -rw-r--r-- | src/kernel/blk.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/kernel/blk.c b/src/kernel/blk.c index 9cd4a76..e55de25 100644 --- a/src/kernel/blk.c +++ b/src/kernel/blk.c @@ -200,18 +200,7 @@ int dnbd3_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, u break; case IOCTL_SWITCH: - if (msg == NULL) - { - result = -EINVAL; - } - else if (memcmp(&dev->cur_server.host, &msg->host, sizeof(msg->host))) - { - dnbd3_net_disconnect(dev); - dev->cur_server.host = msg->host; - result = dnbd3_net_connect(dev); - } - else - result = 0; + result = -EINVAL; break; case IOCTL_ADD_SRV: |