Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-30 08:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

drbd: prepare to activate two activity log extents at once

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:
Lars Ellenberg 2011-03-31 16:00:51 +02:00 committed by Philipp Reisner
parent 181286ad22
commit 7726547e67
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/block/drbd/drbd_actlog.c
View File

@ -207,15 +207,22 @@ static struct lc_element *_al_get(struct drbd_conf *mdev, unsigned int enr)
void drbd_al_begin_io(struct drbd_conf *mdev, struct drbd_interval *i) void drbd_al_begin_io(struct drbd_conf *mdev, struct drbd_interval *i)
{ {
unsigned int enr = (i->sector >> (AL_EXTENT_SHIFT-9)); /* for bios crossing activity log extent boundaries,
struct lc_element *al_ext; * we may need to activate two extents in one go */
unsigned int enr[2];
struct lc_element *al_ext[2] = { NULL, NULL };
struct update_al_work al_work; struct update_al_work al_work;
D_ASSERT(atomic_read(&mdev->local_cnt) > 0); D_ASSERT(atomic_read(&mdev->local_cnt) > 0);
wait_event(mdev->al_wait, (al_ext = _al_get(mdev, enr))); enr[0] = i->sector >> (AL_EXTENT_SHIFT-9);
enr[1] = (i->sector + (i->size >> 9) - 1) >> (AL_EXTENT_SHIFT-9);
wait_event(mdev->al_wait, (al_ext[0] = _al_get(mdev, enr[0])));
if (enr[0] != enr[1])
wait_event(mdev->al_wait, (al_ext[1] = _al_get(mdev, enr[1])));
if (al_ext->lc_number != enr) { if (al_ext[0]->lc_number != enr[0] ||
(al_ext[1] && al_ext[1]->lc_number != enr[1])) {
/* drbd_al_write_transaction(mdev,al_ext,enr); /* drbd_al_write_transaction(mdev,al_ext,enr);
* recurses into generic_make_request(), which * recurses into generic_make_request(), which
* disallows recursion, bios being serialized on the * disallows recursion, bios being serialized on the
@ -232,7 +239,8 @@ void drbd_al_begin_io(struct drbd_conf *mdev, struct drbd_interval *i)
/* Double check: it may have been committed by someone else, /* Double check: it may have been committed by someone else,
* while we have been waiting for the lock. */ * while we have been waiting for the lock. */
if (al_ext->lc_number != enr) { if (al_ext[0]->lc_number != enr[0] ||
(al_ext[1] && al_ext[1]->lc_number != enr[1])) {
init_completion(&al_work.event); init_completion(&al_work.event);
al_work.w.cb = w_al_write_transaction; al_work.w.cb = w_al_write_transaction;
al_work.w.mdev = mdev; al_work.w.mdev = mdev;