From fd9853dbd6287f0c37fa20758cd3a879e9256786 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Mon, 13 Dec 2010 02:25:41 +0100 Subject: [PATCH] --- yaml --- r: 345933 b: refs/heads/master c: 3fbf4d21ae9b7a61ce56c80573b64a1cc18c10ce h: refs/heads/master i: 345931: aa80ac294741ff74f66533b926dc720409091504 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_actlog.c | 14 ++++++-------- trunk/drivers/block/drbd/drbd_main.c | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index f6b72f5a0b36..6a5d126cca64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac29f4039aca8dd98c631c8b5c66f3dd76c2408c +refs/heads/master: 3fbf4d21ae9b7a61ce56c80573b64a1cc18c10ce diff --git a/trunk/drivers/block/drbd/drbd_actlog.c b/trunk/drivers/block/drbd/drbd_actlog.c index 6517c91de4b8..586776195a79 100644 --- a/trunk/drivers/block/drbd/drbd_actlog.c +++ b/trunk/drivers/block/drbd/drbd_actlog.c @@ -151,7 +151,7 @@ static int _drbd_md_sync_page_io(struct drbd_conf *mdev, int drbd_md_sync_page_io(struct drbd_conf *mdev, struct drbd_backing_dev *bdev, sector_t sector, int rw) { - int ok; + int err; struct page *iop = mdev->md_io_page; D_ASSERT(mutex_is_locked(&mdev->md_io_mutex)); @@ -168,14 +168,12 @@ int drbd_md_sync_page_io(struct drbd_conf *mdev, struct drbd_backing_dev *bdev, current->comm, current->pid, __func__, (unsigned long long)sector, (rw & WRITE) ? "WRITE" : "READ"); - ok = !_drbd_md_sync_page_io(mdev, bdev, iop, sector, rw, MD_BLOCK_SIZE); - if (unlikely(!ok)) { + err = _drbd_md_sync_page_io(mdev, bdev, iop, sector, rw, MD_BLOCK_SIZE); + if (err) { dev_err(DEV, "drbd_md_sync_page_io(,%llus,%s) failed!\n", (unsigned long long)sector, (rw & WRITE) ? "WRITE" : "READ"); - return 0; } - - return ok; + return err; } static struct lc_element *_al_get(struct drbd_conf *mdev, unsigned int enr) @@ -392,7 +390,7 @@ w_al_write_transaction(struct drbd_work *w, int unused) if (drbd_bm_write_hinted(mdev)) aw->err = -EIO; /* drbd_chk_io_error done already */ - else if (!drbd_md_sync_page_io(mdev, mdev->ldev, sector, WRITE)) { + else if (drbd_md_sync_page_io(mdev, mdev->ldev, sector, WRITE)) { aw->err = -EIO; drbd_chk_io_error(mdev, 1, true); } else { @@ -439,7 +437,7 @@ static int drbd_al_read_tr(struct drbd_conf *mdev, /* Dont process error normally, * as this is done before disk is attached! */ - if (!drbd_md_sync_page_io(mdev, bdev, sector, READ)) + if (drbd_md_sync_page_io(mdev, bdev, sector, READ)) return -1; if (!expect(b->magic == cpu_to_be32(DRBD_AL_MAGIC))) diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 6c4454c9b4da..43b9b7a067bd 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -2637,7 +2637,7 @@ void drbd_md_sync(struct drbd_conf *mdev) D_ASSERT(drbd_md_ss__(mdev, mdev->ldev) == mdev->ldev->md.md_offset); sector = mdev->ldev->md.md_offset; - if (!drbd_md_sync_page_io(mdev, mdev->ldev, sector, WRITE)) { + if (drbd_md_sync_page_io(mdev, mdev->ldev, sector, WRITE)) { /* this was a try anyways ... */ dev_err(DEV, "meta data update failed!\n"); drbd_chk_io_error(mdev, 1, true); @@ -2670,7 +2670,7 @@ int drbd_md_read(struct drbd_conf *mdev, struct drbd_backing_dev *bdev) mutex_lock(&mdev->md_io_mutex); buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page); - if (!drbd_md_sync_page_io(mdev, bdev, bdev->md.md_offset, READ)) { + if (drbd_md_sync_page_io(mdev, bdev, bdev->md.md_offset, READ)) { /* NOTE: can't do normal error processing here as this is called BEFORE disk is attached */ dev_err(DEV, "Error while reading metadata.\n");