aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2010-12-17 17:58:41 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-03-10 05:43:37 -0500
commit7648cdfe52daf0ca4fa9489879dea9e089b0dfe1 (patch)
tree7dd711ec5bda5ef0429bf94205dbbf7fe1659d82 /drivers/block
parent5a22db8968a69bec835d1ed9a96ab3381719e0c0 (diff)
drbd: be less noisy with some log messages
We expect changes to a bitmap page in drbd_bm_write_page, that's why we submit a copy page. If a page changes during global writeout, that would be unexpected, and reason to warn, though. Also, often page writeout can be skipped (on activity log transactions during normal operation, for example), no need to log that everytime. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_bitmap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index 423dede45844..314a3632303b 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -920,8 +920,9 @@ static void bm_async_io_complete(struct bio *bio, int error)
920 if (!error && !uptodate) 920 if (!error && !uptodate)
921 error = -EIO; 921 error = -EIO;
922 922
923 if (!bm_test_page_unchanged(b->bm_pages[idx])) 923 if ((ctx->flags & BM_AIO_COPY_PAGES) == 0 &&
924 dev_info(DEV, "bitmap page idx %u changed during IO!\n", idx); 924 !bm_test_page_unchanged(b->bm_pages[idx]))
925 dev_warn(DEV, "bitmap page idx %u changed during IO!\n", idx);
925 926
926 if (error) { 927 if (error) {
927 /* ctx error will hold the completed-last non-zero error code, 928 /* ctx error will hold the completed-last non-zero error code,
@@ -1135,7 +1136,7 @@ int drbd_bm_write_page(struct drbd_conf *mdev, unsigned int idx) __must_hold(loc
1135 struct bm_aio_ctx ctx = { .flags = BM_AIO_COPY_PAGES, }; 1136 struct bm_aio_ctx ctx = { .flags = BM_AIO_COPY_PAGES, };
1136 1137
1137 if (bm_test_page_unchanged(mdev->bitmap->bm_pages[idx])) { 1138 if (bm_test_page_unchanged(mdev->bitmap->bm_pages[idx])) {
1138 dev_info(DEV, "skipped bm page write for idx %u\n", idx); 1139 dynamic_dev_dbg(DEV, "skipped bm page write for idx %u\n", idx);
1139 return 0; 1140 return 0;
1140 } 1141 }
1141 1142