diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-12-31 10:00:27 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-31 10:00:27 +0100 |
| commit | c1152949bbdfddf8fc857a883294461d757d5332 (patch) | |
| tree | 716d010ea62e6f00215b3b5f99c3b544fbef2b16 /drivers/block/drbd/drbd_receiver.c | |
| parent | 08d869aa8683703c4a60fdc574dd0809f9b073cd (diff) | |
| parent | 367a8d738542b091228613751af0958ce25bbeb3 (diff) | |
| download | talos-obmc-linux-c1152949bbdfddf8fc857a883294461d757d5332.tar.gz talos-obmc-linux-c1152949bbdfddf8fc857a883294461d757d5332.zip | |
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 259c1351b152..a6d266ee7e2a 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -1201,10 +1201,11 @@ static int receive_Barrier(struct drbd_conf *mdev, struct p_header *h) case WO_bdev_flush: case WO_drain_io: - D_ASSERT(rv == FE_STILL_LIVE); - set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &mdev->current_epoch->flags); - drbd_wait_ee_list_empty(mdev, &mdev->active_ee); - rv = drbd_flush_after_epoch(mdev, mdev->current_epoch); + if (rv == FE_STILL_LIVE) { + set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &mdev->current_epoch->flags); + drbd_wait_ee_list_empty(mdev, &mdev->active_ee); + rv = drbd_flush_after_epoch(mdev, mdev->current_epoch); + } if (rv == FE_RECYCLED) return TRUE; |
