From: Philipp Reisner <philipp.reisner@linbit.com>
To: linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>
Cc: drbd-dev@lists.linbit.com
Subject: [PATCH 16/16] drbd: Fixed conn_lowest_minor
Date: Fri, 2 Sep 2011 12:00:48 +0200 [thread overview]
Message-ID: <1314957648-13242-17-git-send-email-philipp.reisner@linbit.com> (raw)
In-Reply-To: <1314957648-13242-1-git-send-email-philipp.reisner@linbit.com>
It actually returned the lowest volume number. While doing that
renamed a few wrongly named variables.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
---
drivers/block/drbd/drbd_main.c | 12 +++++++-----
drivers/block/drbd/drbd_nl.c | 4 ++--
drivers/block/drbd/drbd_state.c | 8 ++++----
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index b1de7e8..4d6207a 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -434,7 +434,7 @@ void tl_clear(struct drbd_tconn *tconn)
struct drbd_conf *mdev;
struct list_head *le, *tle;
struct drbd_request *r;
- int minor;
+ int vnr;
spin_lock_irq(&tconn->req_lock);
@@ -453,7 +453,7 @@ void tl_clear(struct drbd_tconn *tconn)
}
/* ensure bit indicating barrier is required is clear */
- idr_for_each_entry(&tconn->volumes, mdev, minor)
+ idr_for_each_entry(&tconn->volumes, mdev, vnr)
clear_bit(CREATE_BARRIER, &mdev->flags);
spin_unlock_irq(&tconn->req_lock);
@@ -634,11 +634,13 @@ char *drbd_task_to_thread_name(struct drbd_tconn *tconn, struct task_struct *tas
int conn_lowest_minor(struct drbd_tconn *tconn)
{
- int minor = 0;
+ int vnr = 0;
+ struct drbd_conf *mdev;
- if (!idr_get_next(&tconn->volumes, &minor))
+ mdev = idr_get_next(&tconn->volumes, &vnr);
+ if (!mdev)
return -1;
- return minor;
+ return mdev_to_minor(mdev);
}
#ifdef CONFIG_SMP
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index ab22019..fe4b106 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -361,9 +361,9 @@ int drbd_khelper(struct drbd_conf *mdev, char *cmd)
static void conn_md_sync(struct drbd_tconn *tconn)
{
struct drbd_conf *mdev;
- int minor;
+ int vnr;
- idr_for_each_entry(&tconn->volumes, mdev, minor)
+ idr_for_each_entry(&tconn->volumes, mdev, vnr)
drbd_md_sync(mdev);
}
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
index c4a0710..42a94cd 100644
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -51,9 +51,9 @@ static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state
bool conn_all_vols_unconf(struct drbd_tconn *tconn)
{
struct drbd_conf *mdev;
- int minor;
+ int vnr;
- idr_for_each_entry(&tconn->volumes, mdev, minor) {
+ idr_for_each_entry(&tconn->volumes, mdev, vnr) {
if (mdev->state.disk != D_DISKLESS ||
mdev->state.conn != C_STANDALONE ||
mdev->state.role != R_SECONDARY)
@@ -333,9 +333,9 @@ static void print_state_change(struct drbd_conf *mdev, union drbd_state os, unio
static bool vol_has_primary_peer(struct drbd_tconn *tconn)
{
struct drbd_conf *mdev;
- int minor;
+ int vnr;
- idr_for_each_entry(&tconn->volumes, mdev, minor) {
+ idr_for_each_entry(&tconn->volumes, mdev, vnr) {
if (mdev->state.peer == R_PRIMARY)
return true;
}
--
1.7.4.1
prev parent reply other threads:[~2011-09-02 10:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-02 10:00 [RFC 00/16] drbd: part 5 of adding multiple volume support to drbd Philipp Reisner
2011-09-02 10:00 ` [PATCH 01/16] drbd: process_done_ee() has to handle unconfigured devices now Philipp Reisner
2011-09-02 10:00 ` [PATCH 02/16] drbd: New minors have to intherit the connection state form their connection Philipp Reisner
2011-09-02 10:00 ` [PATCH 03/16] drbd: Allow two diskless minors to be connected Philipp Reisner
2011-09-02 10:00 ` [PATCH 04/16] drbd: Do not modify the connection state with something else that conn_request_state() Philipp Reisner
2011-09-02 10:00 ` [PATCH 05/16] drbd: Moved CONN_DRY_RUN to the per connection (tconn) flags Philipp Reisner
2011-09-02 10:00 ` [PATCH 06/16] drbd: Allow packet handler functions that take a connection Philipp Reisner
2011-09-02 10:00 ` [PATCH 07/16] drbd: Converted receive_protocol() from mdev to tconn Philipp Reisner
2011-09-02 10:00 ` [PATCH 08/16] drbd: Separate connection state changes from minor dev state changes #1 Philipp Reisner
2011-09-02 10:00 ` [PATCH 09/16] drbd: Allow packet handler functions that take a connection (meta connection) Philipp Reisner
2011-09-02 10:00 ` [PATCH 10/16] drbd: Converted got_Ping() and got_PingAck() from mdev to tconn Philipp Reisner
2011-09-02 10:00 ` [PATCH 11/16] drbd: Separate connection state changes from minor dev state changes #2 Philipp Reisner
2011-09-02 10:00 ` [PATCH 12/16] drbd: fix conn_reconfig_start without conn_reconfig_done in drbd_adm_attach Philipp Reisner
2011-09-02 10:00 ` [PATCH 13/16] drbd: Allow volumes to become primary only on one side Philipp Reisner
2011-09-02 10:00 ` [PATCH 14/16] drbd: conn_khelper() for user mode callbacks for connections Philipp Reisner
2011-09-02 10:00 ` [PATCH 15/16] drbd: distribute former syncer_conf settings to disk, connection, and resource level Philipp Reisner
2011-09-02 10:00 ` Philipp Reisner [this message]
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=1314957648-13242-17-git-send-email-philipp.reisner@linbit.com \
--to=philipp.reisner@linbit.com \
--cc=axboe@kernel.dk \
--cc=drbd-dev@lists.linbit.com \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®