lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drbd: Fixed state transitions after async outdate-peer-handler returned

Browse Source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner
2011-05-17 14:19:41 +02:00
parent fa7d939663
commit 21423fa791
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/block/drbd/drbd_nl.c
View File

@@ -272,9 +272,22 @@ static int _try_outdate_peer_async(void *data)
{ {
struct drbd_conf *mdev = (struct drbd_conf *)data; struct drbd_conf *mdev = (struct drbd_conf *)data;
enum drbd_disk_state nps; enum drbd_disk_state nps;
union drbd_state ns;
nps = drbd_try_outdate_peer(mdev); nps = drbd_try_outdate_peer(mdev);
drbd_request_state(mdev, NS(pdsk, nps));
/* Not using
drbd_request_state(mdev, NS(pdsk, nps));
here, because we might were able to re-establish the connection in the
meantime.
*/
spin_lock_irq(&mdev->req_lock);
ns = mdev->state;
if (ns.conn < C_WF_REPORT_PARAMS) {
ns.pdsk = nps;
_drbd_set_state(mdev, ns, CS_VERBOSE, NULL);
}
spin_unlock_irq(&mdev->req_lock);
return 0; return 0;
} }