Skip to content

Commit

Permalink
nbd: Change 'disconnect' to be boolean
Browse files Browse the repository at this point in the history
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Acked-by: Pavel Machek  <pavel@ucw.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
  • Loading branch information
Markus Pargmann authored and Jens Axboe committed Aug 17, 2015
1 parent 30d53d9 commit 696697c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/block/nbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ struct nbd_device {
int blksize;
loff_t bytesize;
int xmit_timeout;
int disconnect; /* a disconnect has been requested by user */
bool disconnect; /* a disconnect has been requested by user */

struct timer_list timeout_timer;
struct task_struct *task_recv;
Expand Down Expand Up @@ -145,7 +145,7 @@ static void nbd_xmit_timeout(unsigned long arg)
if (list_empty(&nbd->queue_head))
return;

nbd->disconnect = 1;
nbd->disconnect = true;

task = READ_ONCE(nbd->task_recv);
if (task)
Expand Down Expand Up @@ -646,7 +646,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
if (!nbd->sock)
return -EINVAL;

nbd->disconnect = 1;
nbd->disconnect = true;

nbd_send_req(nbd, &sreq);
return 0;
Expand Down Expand Up @@ -674,7 +674,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
nbd->sock = sock;
if (max_part > 0)
bdev->bd_invalidated = 1;
nbd->disconnect = 0; /* we're connected now */
nbd->disconnect = false; /* we're connected now */
return 0;
}
return -EINVAL;
Expand Down

0 comments on commit 696697c

Please sign in to comment.