Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0180171 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Remove the terrible DEV hack 



DRBD was using dev_err() and similar all over the code; instead of having to
write dev_err(disk_to_dev(device->vdisk), ...) to convert a drbd_device into a
kernel device, a DEV macro was used which implicitly references the device
variable.  This is terrible; introduce separate drbd_err() and similar macros
with an explicit device parameter instead.

Signed-off-by: default avatarAndreas Gruenbacher <agruen@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
parent c06ece6b

drivers/block/drbd/drbd_actlog.c

+27 −27
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ void wait_until_done_or_force_detached(struct drbd_device *device, struct drbd_b 
	dt = wait_event_timeout(device->misc_wait,

			*done || test_bit(FORCE_DETACH, &device->flags), dt);

	if (dt == 0) {

		dev_err(DEV, "meta-data IO operation timed out\n");

		drbd_err(device, "meta-data IO operation timed out\n");

		drbd_chk_io_error(device, 1, DRBD_FORCE_DETACH);

	}

}
@@ -172,7 +172,7 @@ static int _drbd_md_sync_page_io(struct drbd_device *device, 
		;

	else if (!get_ldev_if_state(device, D_ATTACHING)) {

		/* Corresponding put_ldev in drbd_md_io_complete() */

		dev_err(DEV, "ASSERT FAILED: get_ldev_if_state() == 1 in _drbd_md_sync_page_io()\n");

		drbd_err(device, "ASSERT FAILED: get_ldev_if_state() == 1 in _drbd_md_sync_page_io()\n");

		err = -ENODEV;

		goto out;

	}
@@ -202,21 +202,21 @@ int drbd_md_sync_page_io(struct drbd_device *device, struct drbd_backing_dev *bd 


	BUG_ON(!bdev->md_bdev);



	dev_dbg(DEV, "meta_data io: %s [%d]:%s(,%llus,%s) %pS\n",

	drbd_dbg(device, "meta_data io: %s [%d]:%s(,%llus,%s) %pS\n",

	     current->comm, current->pid, __func__,

	     (unsigned long long)sector, (rw & WRITE) ? "WRITE" : "READ",

	     (void*)_RET_IP_ );



	if (sector < drbd_md_first_sector(bdev) ||

	    sector + 7 > drbd_md_last_sector(bdev))

		dev_alert(DEV, "%s [%d]:%s(,%llus,%s) out of range md access!\n",

		drbd_alert(device, "%s [%d]:%s(,%llus,%s) out of range md access!\n",

		     current->comm, current->pid, __func__,

		     (unsigned long long)sector, (rw & WRITE) ? "WRITE" : "READ");



	/* we do all our meta data IO in aligned 4k blocks. */

	err = _drbd_md_sync_page_io(device, bdev, iop, sector, rw, 4096);

	if (err) {

		dev_err(DEV, "drbd_md_sync_page_io(,%llus,%s) failed with error %d\n",

		drbd_err(device, "drbd_md_sync_page_io(,%llus,%s) failed with error %d\n",

		    (unsigned long long)sector, (rw & WRITE) ? "WRITE" : "READ", err);

	}

	return err;
@@ -404,7 +404,7 @@ int drbd_al_begin_io_nonblock(struct drbd_device *device, struct drbd_interval * 
		struct lc_element *al_ext;

		al_ext = lc_get_cumulative(device->act_log, enr);

		if (!al_ext)

			dev_info(DEV, "LOGIC BUG for enr=%u\n", enr);

			drbd_info(device, "LOGIC BUG for enr=%u\n", enr);

	}

	return 0;

}
@@ -425,7 +425,7 @@ void drbd_al_complete_io(struct drbd_device *device, struct drbd_interval *i) 
	for (enr = first; enr <= last; enr++) {

		extent = lc_find(device->act_log, enr);

		if (!extent) {

			dev_err(DEV, "al_complete_io() called on inactive extent %u\n", enr);

			drbd_err(device, "al_complete_io() called on inactive extent %u\n", enr);

			continue;

		}

		lc_put(device->act_log, extent);
@@ -491,14 +491,14 @@ _al_write_transaction(struct drbd_device *device) 
	int err = 0;



	if (!get_ldev(device)) {

		dev_err(DEV, "disk is %s, cannot start al transaction\n",

		drbd_err(device, "disk is %s, cannot start al transaction\n",

			drbd_disk_str(device->state.disk));

		return -EIO;

	}



	/* The bitmap write may have failed, causing a state change. */

	if (device->state.disk < D_INCONSISTENT) {

		dev_err(DEV,

		drbd_err(device,

			"disk is %s, cannot write al transaction\n",

			drbd_disk_str(device->state.disk));

		put_ldev(device);
@@ -507,7 +507,7 @@ _al_write_transaction(struct drbd_device *device) 


	buffer = drbd_md_get_buffer(device); /* protects md_io_buffer, al_tr_cycle, ... */

	if (!buffer) {

		dev_err(DEV, "disk failed while waiting for md_io buffer\n");

		drbd_err(device, "disk failed while waiting for md_io buffer\n");

		put_ldev(device);

		return -ENODEV;

	}
@@ -689,7 +689,7 @@ static int w_update_odbm(struct drbd_work *w, int unused) 


	if (!get_ldev(device)) {

		if (__ratelimit(&drbd_ratelimit_state))

			dev_warn(DEV, "Can not update on disk bitmap, local IO disabled.\n");

			drbd_warn(device, "Can not update on disk bitmap, local IO disabled.\n");

		kfree(udw);

		return 0;

	}
@@ -744,7 +744,7 @@ static void drbd_try_clear_on_disk_bm(struct drbd_device *device, sector_t secto 
			else

				ext->rs_failed += count;

			if (ext->rs_left < ext->rs_failed) {

				dev_warn(DEV, "BAD! sector=%llus enr=%u rs_left=%d "

				drbd_warn(device, "BAD! sector=%llus enr=%u rs_left=%d "

				    "rs_failed=%d count=%d cstate=%s\n",

				     (unsigned long long)sector,

				     ext->lce.lc_number, ext->rs_left,
@@ -768,14 +768,14 @@ static void drbd_try_clear_on_disk_bm(struct drbd_device *device, sector_t secto 
			 */

			int rs_left = drbd_bm_e_weight(device, enr);

			if (ext->flags != 0) {

				dev_warn(DEV, "changing resync lce: %d[%u;%02lx]"

				drbd_warn(device, "changing resync lce: %d[%u;%02lx]"

				     " -> %d[%u;00]\n",

				     ext->lce.lc_number, ext->rs_left,

				     ext->flags, enr, rs_left);

				ext->flags = 0;

			}

			if (ext->rs_failed) {

				dev_warn(DEV, "Kicking resync_lru element enr=%u "

				drbd_warn(device, "Kicking resync_lru element enr=%u "

				     "out with rs_failed=%d\n",

				     ext->lce.lc_number, ext->rs_failed);

			}
@@ -798,11 +798,11 @@ static void drbd_try_clear_on_disk_bm(struct drbd_device *device, sector_t secto 
				udw->w.device = device;

				drbd_queue_work_front(&first_peer_device(device)->connection->sender_work, &udw->w);

			} else {

				dev_warn(DEV, "Could not kmalloc an udw\n");

				drbd_warn(device, "Could not kmalloc an udw\n");

			}

		}

	} else {

		dev_err(DEV, "lc_get() failed! locked=%d/%d flags=%lu\n",

		drbd_err(device, "lc_get() failed! locked=%d/%d flags=%lu\n",

		    device->resync_locked,

		    device->resync->nr_elements,

		    device->resync->flags);
@@ -843,7 +843,7 @@ void __drbd_set_in_sync(struct drbd_device *device, sector_t sector, int size, 
	unsigned long flags;



	if (size <= 0 || !IS_ALIGNED(size, 512) || size > DRBD_MAX_BIO_SIZE) {

		dev_err(DEV, "drbd_set_in_sync: sector=%llus size=%d nonsense!\n",

		drbd_err(device, "drbd_set_in_sync: sector=%llus size=%d nonsense!\n",

				(unsigned long long)sector, size);

		return;

	}
@@ -917,7 +917,7 @@ int __drbd_set_out_of_sync(struct drbd_device *device, sector_t sector, int size 
		return 0;



	if (size < 0 || !IS_ALIGNED(size, 512) || size > DRBD_MAX_BIO_SIZE) {

		dev_err(DEV, "sector: %llus, size: %d\n",

		drbd_err(device, "sector: %llus, size: %d\n",

			(unsigned long long)sector, size);

		return 0;

	}
@@ -988,7 +988,7 @@ struct bm_extent *_bme_get(struct drbd_device *device, unsigned int enr) 


	if (!bm_ext) {

		if (rs_flags & LC_STARVING)

			dev_warn(DEV, "Have to wait for element"

			drbd_warn(device, "Have to wait for element"

			     " (resync LRU too small?)\n");

		BUG_ON(rs_flags & LC_LOCKED);

	}
@@ -1049,7 +1049,7 @@ int drbd_rs_begin_io(struct drbd_device *device, sector_t sector) 
			if (schedule_timeout_interruptible(HZ/10))

				return -EINTR;

			if (sa && --sa == 0)

				dev_warn(DEV,"drbd_rs_begin_io() stepped aside for 20sec."

				drbd_warn(device, "drbd_rs_begin_io() stepped aside for 20sec."

					 "Resync stalled?\n");

			goto retry;

		}
@@ -1101,7 +1101,7 @@ int drbd_try_rs_begin_io(struct drbd_device *device, sector_t sector) 
				device->resync_locked--;

			wake_up(&device->al_wait);

		} else {

			dev_alert(DEV, "LOGIC BUG\n");

			drbd_alert(device, "LOGIC BUG\n");

		}

	}

	/* TRY. */
@@ -1131,7 +1131,7 @@ int drbd_try_rs_begin_io(struct drbd_device *device, sector_t sector) 
		if (!bm_ext) {

			const unsigned long rs_flags = device->resync->flags;

			if (rs_flags & LC_STARVING)

				dev_warn(DEV, "Have to wait for element"

				drbd_warn(device, "Have to wait for element"

				     " (resync LRU too small?)\n");

			BUG_ON(rs_flags & LC_LOCKED);

			goto try_again;
@@ -1179,13 +1179,13 @@ void drbd_rs_complete_io(struct drbd_device *device, sector_t sector) 
	if (!bm_ext) {

		spin_unlock_irqrestore(&device->al_lock, flags);

		if (__ratelimit(&drbd_ratelimit_state))

			dev_err(DEV, "drbd_rs_complete_io() called, but extent not found\n");

			drbd_err(device, "drbd_rs_complete_io() called, but extent not found\n");

		return;

	}



	if (bm_ext->lce.refcnt == 0) {

		spin_unlock_irqrestore(&device->al_lock, flags);

		dev_err(DEV, "drbd_rs_complete_io(,%llu [=%u]) called, "

		drbd_err(device, "drbd_rs_complete_io(,%llu [=%u]) called, "

		    "but refcnt is 0!?\n",

		    (unsigned long long)sector, enr);

		return;
@@ -1241,7 +1241,7 @@ int drbd_rs_del_all(struct drbd_device *device) 
			if (bm_ext->lce.lc_number == LC_FREE)

				continue;

			if (bm_ext->lce.lc_number == device->resync_wenr) {

				dev_info(DEV, "dropping %u in drbd_rs_del_all, apparently"

				drbd_info(device, "dropping %u in drbd_rs_del_all, apparently"

				     " got 'synced' by application io\n",

				     device->resync_wenr);

				D_ASSERT(!test_bit(BME_LOCKED, &bm_ext->flags));
@@ -1251,7 +1251,7 @@ int drbd_rs_del_all(struct drbd_device *device) 
				lc_put(device->resync, &bm_ext->lce);

			}

			if (bm_ext->lce.refcnt != 0) {

				dev_info(DEV, "Retrying drbd_rs_del_all() later. "

				drbd_info(device, "Retrying drbd_rs_del_all() later. "

				     "refcnt=%d\n", bm_ext->lce.refcnt);

				put_ldev(device);

				spin_unlock_irq(&device->al_lock);
@@ -1285,7 +1285,7 @@ void drbd_rs_failed_io(struct drbd_device *device, sector_t sector, int size) 
	int wake_up = 0;



	if (size <= 0 || !IS_ALIGNED(size, 512) || size > DRBD_MAX_BIO_SIZE) {

		dev_err(DEV, "drbd_rs_failed_io: sector=%llus size=%d nonsense!\n",

		drbd_err(device, "drbd_rs_failed_io: sector=%llus size=%d nonsense!\n",

				(unsigned long long)sector, size);

		return;

	}

drivers/block/drbd/drbd_bitmap.c

+29 −29
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void __bm_print_lock_info(struct drbd_device *device, const char *func) 
	struct drbd_bitmap *b = device->bitmap;

	if (!__ratelimit(&drbd_ratelimit_state))

		return;

	dev_err(DEV, "FIXME %s in %s, bitmap locked for '%s' by %s\n",

	drbd_err(device, "FIXME %s in %s, bitmap locked for '%s' by %s\n",

		drbd_task_to_thread_name(first_peer_device(device)->connection, current),

		func, b->bm_why ?: "?",

		drbd_task_to_thread_name(first_peer_device(device)->connection, b->bm_task));
@@ -130,21 +130,21 @@ void drbd_bm_lock(struct drbd_device *device, char *why, enum bm_flag flags) 
	int trylock_failed;



	if (!b) {

		dev_err(DEV, "FIXME no bitmap in drbd_bm_lock!?\n");

		drbd_err(device, "FIXME no bitmap in drbd_bm_lock!?\n");

		return;

	}



	trylock_failed = !mutex_trylock(&b->bm_change);



	if (trylock_failed) {

		dev_warn(DEV, "%s going to '%s' but bitmap already locked for '%s' by %s\n",

		drbd_warn(device, "%s going to '%s' but bitmap already locked for '%s' by %s\n",

			 drbd_task_to_thread_name(first_peer_device(device)->connection, current),

			 why, b->bm_why ?: "?",

			 drbd_task_to_thread_name(first_peer_device(device)->connection, b->bm_task));

		mutex_lock(&b->bm_change);

	}

	if (BM_LOCKED_MASK & b->bm_flags)

		dev_err(DEV, "FIXME bitmap already locked in bm_lock\n");

		drbd_err(device, "FIXME bitmap already locked in bm_lock\n");

	b->bm_flags |= flags & BM_LOCKED_MASK;



	b->bm_why  = why;
@@ -155,12 +155,12 @@ void drbd_bm_unlock(struct drbd_device *device) 
{

	struct drbd_bitmap *b = device->bitmap;

	if (!b) {

		dev_err(DEV, "FIXME no bitmap in drbd_bm_unlock!?\n");

		drbd_err(device, "FIXME no bitmap in drbd_bm_unlock!?\n");

		return;

	}



	if (!(BM_LOCKED_MASK & device->bitmap->bm_flags))

		dev_err(DEV, "FIXME bitmap not locked in bm_unlock\n");

		drbd_err(device, "FIXME bitmap not locked in bm_unlock\n");



	b->bm_flags &= ~BM_LOCKED_MASK;

	b->bm_why  = NULL;
@@ -253,7 +253,7 @@ void drbd_bm_mark_for_writeout(struct drbd_device *device, int page_nr) 
{

	struct page *page;

	if (page_nr >= device->bitmap->bm_number_of_pages) {

		dev_warn(DEV, "BAD: page_nr: %u, number_of_pages: %u\n",

		drbd_warn(device, "BAD: page_nr: %u, number_of_pages: %u\n",

			 page_nr, (int)device->bitmap->bm_number_of_pages);

		return;

	}
@@ -645,7 +645,7 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi 


	drbd_bm_lock(device, "resize", BM_LOCKED_MASK);



	dev_info(DEV, "drbd_bm_resize called with capacity == %llu\n",

	drbd_info(device, "drbd_bm_resize called with capacity == %llu\n",

			(unsigned long long)capacity);



	if (capacity == b->bm_dev_capacity)
@@ -682,8 +682,8 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi 
		u64 bits_on_disk = drbd_md_on_disk_bits(device->ldev);

		put_ldev(device);

		if (bits > bits_on_disk) {

			dev_info(DEV, "bits = %lu\n", bits);

			dev_info(DEV, "bits_on_disk = %llu\n", bits_on_disk);

			drbd_info(device, "bits = %lu\n", bits);

			drbd_info(device, "bits_on_disk = %llu\n", bits_on_disk);

			err = -ENOSPC;

			goto out;

		}
@@ -742,7 +742,7 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi 
		bm_vk_free(opages, opages_vmalloced);

	if (!growing)

		b->bm_set = bm_count_bits(b);

	dev_info(DEV, "resync bitmap: bits=%lu words=%lu pages=%lu\n", bits, words, want);

	drbd_info(device, "resync bitmap: bits=%lu words=%lu pages=%lu\n", bits, words, want);



 out:

	drbd_bm_unlock(device);
@@ -878,7 +878,7 @@ void drbd_bm_get_lel(struct drbd_device *device, size_t offset, size_t number, 
	if ((offset >= b->bm_words) ||

	    (end    >  b->bm_words) ||

	    (number <= 0))

		dev_err(DEV, "offset=%lu number=%lu bm_words=%lu\n",

		drbd_err(device, "offset=%lu number=%lu bm_words=%lu\n",

			(unsigned long)	offset,

			(unsigned long)	number,

			(unsigned long) b->bm_words);
@@ -966,7 +966,7 @@ static void bm_async_io_complete(struct bio *bio, int error) 


	if ((ctx->flags & BM_AIO_COPY_PAGES) == 0 &&

	    !bm_test_page_unchanged(b->bm_pages[idx]))

		dev_warn(DEV, "bitmap page idx %u changed during IO!\n", idx);

		drbd_warn(device, "bitmap page idx %u changed during IO!\n", idx);



	if (error) {

		/* ctx error will hold the completed-last non-zero error code,
@@ -976,11 +976,11 @@ static void bm_async_io_complete(struct bio *bio, int error) 
		/* Not identical to on disk version of it.

		 * Is BM_PAGE_IO_ERROR enough? */

		if (__ratelimit(&drbd_ratelimit_state))

			dev_err(DEV, "IO ERROR %d on bitmap page idx %u\n",

			drbd_err(device, "IO ERROR %d on bitmap page idx %u\n",

					error, idx);

	} else {

		bm_clear_page_io_err(b->bm_pages[idx]);

		dynamic_dev_dbg(DEV, "bitmap page idx %u completed\n", idx);

		dynamic_drbd_dbg(device, "bitmap page idx %u completed\n", idx);

	}



	bm_page_unlock_io(device, idx);
@@ -1081,7 +1081,7 @@ static int bm_rw(struct drbd_device *device, int rw, unsigned flags, unsigned la 
	};



	if (!get_ldev_if_state(device, D_ATTACHING)) {  /* put is in bm_aio_ctx_destroy() */

		dev_err(DEV, "ASSERT FAILED: get_ldev_if_state() == 1 in bm_rw()\n");

		drbd_err(device, "ASSERT FAILED: get_ldev_if_state() == 1 in bm_rw()\n");

		kfree(ctx);

		return -ENODEV;

	}
@@ -1106,14 +1106,14 @@ static int bm_rw(struct drbd_device *device, int rw, unsigned flags, unsigned la 


			if (!(flags & BM_WRITE_ALL_PAGES) &&

			    bm_test_page_unchanged(b->bm_pages[i])) {

				dynamic_dev_dbg(DEV, "skipped bm write for idx %u\n", i);

				dynamic_drbd_dbg(device, "skipped bm write for idx %u\n", i);

				continue;

			}

			/* during lazy writeout,

			 * ignore those pages not marked for lazy writeout. */

			if (lazy_writeout_upper_idx &&

			    !bm_test_page_lazy_writeout(b->bm_pages[i])) {

				dynamic_dev_dbg(DEV, "skipped bm lazy write for idx %u\n", i);

				dynamic_drbd_dbg(device, "skipped bm lazy write for idx %u\n", i);

				continue;

			}

		}
@@ -1138,12 +1138,12 @@ static int bm_rw(struct drbd_device *device, int rw, unsigned flags, unsigned la 


	/* summary for global bitmap IO */

	if (flags == 0)

		dev_info(DEV, "bitmap %s of %u pages took %lu jiffies\n",

		drbd_info(device, "bitmap %s of %u pages took %lu jiffies\n",

			 rw == WRITE ? "WRITE" : "READ",

			 count, jiffies - now);



	if (ctx->error) {

		dev_alert(DEV, "we had at least one MD IO ERROR during bitmap IO\n");

		drbd_alert(device, "we had at least one MD IO ERROR during bitmap IO\n");

		drbd_chk_io_error(device, 1, DRBD_META_IO_ERROR);

		err = -EIO; /* ctx->error ? */

	}
@@ -1156,13 +1156,13 @@ static int bm_rw(struct drbd_device *device, int rw, unsigned flags, unsigned la 
		drbd_md_flush(device);

	} else /* rw == READ */ {

		b->bm_set = bm_count_bits(b);

		dev_info(DEV, "recounting of set bits took additional %lu jiffies\n",

		drbd_info(device, "recounting of set bits took additional %lu jiffies\n",

		     jiffies - now);

	}

	now = b->bm_set;



	if (flags == 0)

		dev_info(DEV, "%s (%lu bits) marked out-of-sync by on disk bit-map.\n",

		drbd_info(device, "%s (%lu bits) marked out-of-sync by on disk bit-map.\n",

		     ppsize(ppb, now << (BM_BLOCK_SHIFT-10)), now);



	kref_put(&ctx->kref, &bm_aio_ctx_destroy);
@@ -1243,7 +1243,7 @@ int drbd_bm_write_page(struct drbd_device *device, unsigned int idx) __must_hold 
	int err;



	if (bm_test_page_unchanged(device->bitmap->bm_pages[idx])) {

		dynamic_dev_dbg(DEV, "skipped bm page write for idx %u\n", idx);

		dynamic_drbd_dbg(device, "skipped bm page write for idx %u\n", idx);

		return 0;

	}
@@ -1261,7 +1261,7 @@ int drbd_bm_write_page(struct drbd_device *device, unsigned int idx) __must_hold 
	};



	if (!get_ldev_if_state(device, D_ATTACHING)) {  /* put is in bm_aio_ctx_destroy() */

		dev_err(DEV, "ASSERT FAILED: get_ldev_if_state() == 1 in drbd_bm_write_page()\n");

		drbd_err(device, "ASSERT FAILED: get_ldev_if_state() == 1 in drbd_bm_write_page()\n");

		kfree(ctx);

		return -ENODEV;

	}
@@ -1298,7 +1298,7 @@ static unsigned long __bm_find_next(struct drbd_device *device, unsigned long bm 




	if (bm_fo > b->bm_bits) {

		dev_err(DEV, "bm_fo=%lu bm_bits=%lu\n", bm_fo, b->bm_bits);

		drbd_err(device, "bm_fo=%lu bm_bits=%lu\n", bm_fo, b->bm_bits);

		bm_fo = DRBD_END_OF_BITMAP;

	} else {

		while (bm_fo < b->bm_bits) {
@@ -1393,7 +1393,7 @@ static int __bm_change_bits_to(struct drbd_device *device, const unsigned long s 
	int changed_total = 0;



	if (e >= b->bm_bits) {

		dev_err(DEV, "ASSERT FAILED: bit_s=%lu bit_e=%lu bm_bits=%lu\n",

		drbd_err(device, "ASSERT FAILED: bit_s=%lu bit_e=%lu bm_bits=%lu\n",

				s, e, b->bm_bits);

		e = b->bm_bits ? b->bm_bits -1 : 0;

	}
@@ -1596,7 +1596,7 @@ int drbd_bm_test_bit(struct drbd_device *device, const unsigned long bitnr) 
	} else if (bitnr == b->bm_bits) {

		i = -1;

	} else { /* (bitnr > b->bm_bits) */

		dev_err(DEV, "bitnr=%lu > bm_bits=%lu\n", bitnr, b->bm_bits);

		drbd_err(device, "bitnr=%lu > bm_bits=%lu\n", bitnr, b->bm_bits);

		i = 0;

	}
@@ -1637,7 +1637,7 @@ int drbd_bm_count_bits(struct drbd_device *device, const unsigned long s, const 
		if (expect(bitnr < b->bm_bits))

			c += (0 != test_bit_le(bitnr - (page_nr << (PAGE_SHIFT+3)), p_addr));

		else

			dev_err(DEV, "bitnr=%lu bm_bits=%lu\n", bitnr, b->bm_bits);

			drbd_err(device, "bitnr=%lu bm_bits=%lu\n", bitnr, b->bm_bits);

	}

	if (p_addr)

		bm_unmap(p_addr);
@@ -1687,7 +1687,7 @@ int drbd_bm_e_weight(struct drbd_device *device, unsigned long enr) 
			count += hweight_long(*bm++);

		bm_unmap(p_addr);

	} else {

		dev_err(DEV, "start offset (%d) too large in drbd_bm_e_weight\n", s);

		drbd_err(device, "start offset (%d) too large in drbd_bm_e_weight\n", s);

	}

	spin_unlock_irqrestore(&b->bm_lock, flags);

	return count;

drivers/block/drbd/drbd_int.h

+27 −12
Original line number Diff line number Diff line
@@ -100,9 +100,24 @@ extern char usermode_helper[]; 
struct drbd_device;

struct drbd_connection;





/* to shorten dev_warn(DEV, "msg"); and relatives statements */

#define DEV (disk_to_dev(device->vdisk))

#define drbd_printk(level, device, fmt, args...) \

	dev_printk(level, disk_to_dev(device->vdisk), fmt, ## args)



#define drbd_dbg(device, fmt, args...) \

	drbd_printk(KERN_DEBUG, device, fmt, ## args)

#define drbd_alert(device, fmt, args...) \

	drbd_printk(KERN_ALERT, device, fmt, ## args)

#define drbd_err(device, fmt, args...) \

	drbd_printk(KERN_ERR, device, fmt, ## args)

#define drbd_warn(device, fmt, args...) \

	drbd_printk(KERN_WARNING, device, fmt, ## args)

#define drbd_info(device, fmt, args...) \

	drbd_printk(KERN_INFO, device, fmt, ## args)

#define drbd_emerg(device, fmt, args...) \

	drbd_printk(KERN_EMERG, device, fmt, ## args)



#define dynamic_drbd_dbg(device, fmt, args...) \

	dynamic_dev_dbg(disk_to_dev(device->vdisk), fmt, ## args)



#define conn_printk(LEVEL, TCONN, FMT, ARGS...) \

	printk(LEVEL "d-con %s: " FMT, TCONN->resource->name , ## ARGS)
@@ -115,7 +130,7 @@ struct drbd_connection; 
#define conn_dbg(TCONN, FMT, ARGS...)    conn_printk(KERN_DEBUG, TCONN, FMT, ## ARGS)



#define D_ASSERT(exp)	if (!(exp)) \

	 dev_err(DEV, "ASSERT( " #exp " ) in %s:%d\n", __FILE__, __LINE__)

	 drbd_err(device, "ASSERT( " #exp " ) in %s:%d\n", __FILE__, __LINE__)



/**

 * expect  -  Make an assertion
@@ -125,7 +140,7 @@ struct drbd_connection; 
#define expect(exp) ({								\

		bool _bool = (exp);						\

		if (!_bool)							\

			dev_err(DEV, "ASSERTION %s FAILED in %s\n",		\

			drbd_err(device, "ASSERTION %s FAILED in %s\n",		\

			        #exp, __func__);				\

		_bool;								\

		})
@@ -1278,7 +1293,7 @@ extern void drbd_rs_controller_reset(struct drbd_device *device); 
static inline void ov_out_of_sync_print(struct drbd_device *device)

{

	if (device->ov_last_oos_size) {

		dev_err(DEV, "Out of sync: start=%llu, size=%lu (sectors)\n",

		drbd_err(device, "Out of sync: start=%llu, size=%lu (sectors)\n",

		     (unsigned long long)device->ov_last_oos_start,

		     (unsigned long)device->ov_last_oos_size);

	}
@@ -1504,7 +1519,7 @@ static inline void __drbd_chk_io_error_(struct drbd_device *device, 
	case EP_PASS_ON: /* FIXME would this be better named "Ignore"? */

		if (df == DRBD_READ_ERROR || df == DRBD_WRITE_ERROR) {

			if (__ratelimit(&drbd_ratelimit_state))

				dev_err(DEV, "Local IO failed in %s.\n", where);

				drbd_err(device, "Local IO failed in %s.\n", where);

			if (device->state.disk > D_INCONSISTENT)

				_drbd_set_state(_NS(device, disk, D_INCONSISTENT), CS_HARD, NULL);

			break;
@@ -1539,7 +1554,7 @@ static inline void __drbd_chk_io_error_(struct drbd_device *device, 
			set_bit(FORCE_DETACH, &device->flags);

		if (device->state.disk > D_FAILED) {

			_drbd_set_state(_NS(device, disk, D_FAILED), CS_HARD, NULL);

			dev_err(DEV,

			drbd_err(device,

				"Local IO failed in %s. Detaching...\n", where);

		}

		break;
@@ -1755,7 +1770,7 @@ static inline void inc_ap_pending(struct drbd_device *device) 


#define ERR_IF_CNT_IS_NEGATIVE(which, func, line)			\

	if (atomic_read(&device->which) < 0)				\

		dev_err(DEV, "in %s:%d: " #which " = %d < 0 !\n",	\

		drbd_err(device, "in %s:%d: " #which " = %d < 0 !\n",	\

			func, line,					\

			atomic_read(&device->which))
@@ -1888,7 +1903,7 @@ static inline void drbd_get_syncer_progress(struct drbd_device *device, 
		 * for now, just prevent in-kernel buffer overflow.

		 */

		smp_rmb();

		dev_warn(DEV, "cs:%s rs_left=%lu > rs_total=%lu (rs_failed %lu)\n",

		drbd_warn(device, "cs:%s rs_left=%lu > rs_total=%lu (rs_failed %lu)\n",

				drbd_conn_str(device->state.conn),

				*bits_left, device->rs_total, device->rs_failed);

		*per_mil_done = 0;
@@ -2103,7 +2118,7 @@ static inline void drbd_md_flush(struct drbd_device *device) 
	int r;



	if (device->ldev == NULL) {

		dev_warn(DEV, "device->ldev == NULL in drbd_md_flush\n");

		drbd_warn(device, "device->ldev == NULL in drbd_md_flush\n");

		return;

	}
@@ -2113,7 +2128,7 @@ static inline void drbd_md_flush(struct drbd_device *device) 
	r = blkdev_issue_flush(device->ldev->md_bdev, GFP_NOIO, NULL);

	if (r) {

		set_bit(MD_NO_FUA, &device->flags);

		dev_err(DEV, "meta data flush failed with status %d, disabling md-flushes\n", r);

		drbd_err(device, "meta data flush failed with status %d, disabling md-flushes\n", r);

	}

}

drivers/block/drbd/drbd_main.c

+31 −31

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/drbd/drbd_nl.c

+37 −37

File changed.

Preview size limit exceeded, changes collapsed.