diff options
Diffstat (limited to 'networking/nbd-client.c')
-rw-r--r-- | networking/nbd-client.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/networking/nbd-client.c b/networking/nbd-client.c index 0dc8d0c43..3db3b46f9 100644 --- a/networking/nbd-client.c +++ b/networking/nbd-client.c | |||
@@ -179,7 +179,7 @@ int nbdclient_main(int argc, char **argv) | |||
179 | if (memcmp(&nbd_header.magic1, "NBDMAGIC", | 179 | if (memcmp(&nbd_header.magic1, "NBDMAGIC", |
180 | sizeof(nbd_header.magic1)) != 0 | 180 | sizeof(nbd_header.magic1)) != 0 |
181 | ) { | 181 | ) { |
182 | bb_error_msg_and_die("login failed"); | 182 | bb_simple_error_msg_and_die("login failed"); |
183 | } | 183 | } |
184 | if (memcmp(&nbd_header.magic2, | 184 | if (memcmp(&nbd_header.magic2, |
185 | "\x00\x00\x42\x02\x81\x86\x12\x53", | 185 | "\x00\x00\x42\x02\x81\x86\x12\x53", |
@@ -189,7 +189,7 @@ int nbdclient_main(int argc, char **argv) | |||
189 | } else if (memcmp(&nbd_header.magic2, "IHAVEOPT", 8) == 0) { | 189 | } else if (memcmp(&nbd_header.magic2, "IHAVEOPT", 8) == 0) { |
190 | proto_new = 1; | 190 | proto_new = 1; |
191 | } else { | 191 | } else { |
192 | bb_error_msg_and_die("login failed"); | 192 | bb_simple_error_msg_and_die("login failed"); |
193 | } | 193 | } |
194 | 194 | ||
195 | if (!proto_new) { | 195 | if (!proto_new) { |
@@ -240,17 +240,17 @@ int nbdclient_main(int argc, char **argv) | |||
240 | } | 240 | } |
241 | 241 | ||
242 | if (ioctl(nbd, BLKROSET, &ro) < 0) { | 242 | if (ioctl(nbd, BLKROSET, &ro) < 0) { |
243 | bb_perror_msg_and_die("BLKROSET"); | 243 | bb_simple_perror_msg_and_die("BLKROSET"); |
244 | } | 244 | } |
245 | 245 | ||
246 | if (timeout) { | 246 | if (timeout) { |
247 | if (ioctl(nbd, NBD_SET_TIMEOUT, (unsigned long) timeout)) { | 247 | if (ioctl(nbd, NBD_SET_TIMEOUT, (unsigned long) timeout)) { |
248 | bb_perror_msg_and_die("NBD_SET_TIMEOUT"); | 248 | bb_simple_perror_msg_and_die("NBD_SET_TIMEOUT"); |
249 | } | 249 | } |
250 | } | 250 | } |
251 | 251 | ||
252 | if (ioctl(nbd, NBD_SET_SOCK, sock)) { | 252 | if (ioctl(nbd, NBD_SET_SOCK, sock)) { |
253 | bb_perror_msg_and_die("NBD_SET_SOCK"); | 253 | bb_simple_perror_msg_and_die("NBD_SET_SOCK"); |
254 | } | 254 | } |
255 | 255 | ||
256 | //if (swap) mlockall(MCL_CURRENT|MCL_FUTURE); | 256 | //if (swap) mlockall(MCL_CURRENT|MCL_FUTURE); |