From: Markus Pargmann <mpa@pengutronix.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-kernel@vger.kernel.org, nbd-general@lists.sourceforge.net,
kernel@pengutronix.de, Markus Pargmann <mpa@pengutronix.de>
Subject: [PATCH 08/10] nbd: Change 'disconnect' to be boolean
Date: Mon, 17 Aug 2015 08:20:07 +0200 [thread overview]
Message-ID: <1439792409-28543-9-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1439792409-28543-1-git-send-email-mpa@pengutronix.de>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
---
drivers/block/nbd.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 188fe0d2b1ac..44160a9e493e 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -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;
@@ -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)
@@ -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;
@@ -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;
--
2.4.6
next prev parent reply other threads:[~2015-08-17 6:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-17 6:19 [PULL 00/10] NBD updates for 4.3 Markus Pargmann
2015-08-17 6:20 ` [PATCH 01/10] nbd: Fix timeout detection Markus Pargmann
2015-09-28 0:27 ` Ben Hutchings
2015-10-01 6:04 ` Markus Pargmann
2015-10-06 18:03 ` [PATCH] nbd: Add locking for tasks Markus Pargmann
2015-10-08 20:14 ` Ben Hutchings
2015-10-08 20:21 ` Jens Axboe
2015-08-17 6:20 ` [PATCH 02/10] nbd: sock_shutdown, remove conditional lock Markus Pargmann
2015-08-17 6:20 ` [PATCH 03/10] nbd: restructure sock_shutdown Markus Pargmann
2015-08-17 6:20 ` [PATCH 04/10] nbd: Remove 'harderror' and propagate error properly Markus Pargmann
2015-08-17 6:20 ` [PATCH 05/10] nbd: Move clear queue debug message Markus Pargmann
2015-08-17 6:20 ` [PATCH 06/10] nbd: Remove variable 'pid' Markus Pargmann
2015-08-17 6:20 ` [PATCH 07/10] nbd: Add debugfs entries Markus Pargmann
2015-08-17 6:20 ` Markus Pargmann [this message]
2015-08-17 6:20 ` [PATCH 09/10] nbd: Rename functions for clearness of recv/send path Markus Pargmann
2015-08-17 6:20 ` [PATCH 10/10] nbd: flags is a u32 variable Markus Pargmann
2015-08-17 14:24 ` [PULL 00/10] NBD updates for 4.3 Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439792409-28543-9-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=axboe@kernel.dk \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=nbd-general@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®