From: Juergen Gross <jgross@suse.com>
To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org,
linux-block@vger.kernel.org
Cc: konrad.wilk@oracle.com, roger.pau@citrix.com, axboe@kernel.dk,
boris.ostrovsky@oracle.com, Juergen Gross <jgross@suse.com>
Subject: [PATCH v2 3/5] xen/blkfront: reorder tests in xlblk_init()
Date: Wed, 8 Aug 2018 16:25:26 +0200 [thread overview]
Message-ID: <20180808142528.31029-4-jgross@suse.com> (raw)
In-Reply-To: <20180808142528.31029-1-jgross@suse.com>
In case we don't want pv block devices we should not test parameters
for sanity and eventually print out error messages. So test precluding
conditions before checking parameters.
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
---
drivers/block/xen-blkfront.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 7c4b1b9d3971..36e4ca41e765 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -2713,6 +2713,15 @@ static int __init xlblk_init(void)
if (!xen_domain())
return -ENODEV;
+ if (!xen_has_pv_disk_devices())
+ return -ENODEV;
+
+ if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {
+ pr_warn("xen_blk: can't get major %d with name %s\n",
+ XENVBD_MAJOR, DEV_NAME);
+ return -ENODEV;
+ }
+
if (xen_blkif_max_segments < BLKIF_MAX_SEGMENTS_PER_REQUEST)
xen_blkif_max_segments = BLKIF_MAX_SEGMENTS_PER_REQUEST;
@@ -2728,15 +2737,6 @@ static int __init xlblk_init(void)
xen_blkif_max_queues = nr_cpus;
}
- if (!xen_has_pv_disk_devices())
- return -ENODEV;
-
- if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {
- printk(KERN_WARNING "xen_blk: can't get major %d with name %s\n",
- XENVBD_MAJOR, DEV_NAME);
- return -ENODEV;
- }
-
INIT_DELAYED_WORK(&blkfront_work, blkfront_delay_work);
ret = xenbus_register_frontend(&blkfront_driver);
--
2.13.7
next prev parent reply other threads:[~2018-08-08 14:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-08 14:25 [PATCH v2 0/5] xen/blk: persistent grant rework Juergen Gross
2018-08-08 14:25 ` [PATCH v2 1/5] xen/blkback: don't keep persistent grants too long Juergen Gross
2018-08-08 15:19 ` [Xen-devel] " Roger Pau Monné
2018-08-09 22:33 ` kbuild test robot
2018-08-09 22:33 ` [RFC PATCH] xen/blkback: xen_blkif_pgrant_timeout can be static kbuild test robot
2018-08-08 14:25 ` [PATCH v2 2/5] xen/blkfront: cleanup stale persistent grants Juergen Gross
2018-08-08 15:23 ` Roger Pau Monné
2018-08-08 14:25 ` Juergen Gross [this message]
2018-08-08 14:25 ` [PATCH v2 4/5] xen/blkback: move persistent grants flags to bool Juergen Gross
2018-08-08 15:35 ` [Xen-devel] " Roger Pau Monné
2018-08-08 14:25 ` [PATCH v2 5/5] xen/blkback: remove unused pers_gnts_lock from struct xen_blkif_ring Juergen Gross
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=20180808142528.31029-4-jgross@suse.com \
--to=jgross@suse.com \
--cc=axboe@kernel.dk \
--cc=boris.ostrovsky@oracle.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=roger.pau@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/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;
as well as URLs for NNTP newsgroup(s).