From 8ccb162b543dfb83a94dd296b240b5c6fdcbd26a Mon Sep 17 00:00:00 2001
From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Thu, 27 May 2010 11:51:56 +0200
Subject: [PATCH] --- yaml --- r: 199905 b: refs/heads/master c:
 7383506c87237dbd627f0b8b72b50117f25c5ca2 h: refs/heads/master i:   199903:
 40f958f28bf3d3e82f7ed05860432305b37c4487 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/block/drbd/drbd_int.h  | 2 +-
 trunk/drivers/block/drbd/drbd_main.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b6ca6e0f12bb..9a85c75eca90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d255e5ff5fc6cc6c60dd014d1261448a7bbc8134
+refs/heads/master: 7383506c87237dbd627f0b8b72b50117f25c5ca2
diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h
index 86605f6d0854..485ed8c7d623 100644
--- a/trunk/drivers/block/drbd/drbd_int.h
+++ b/trunk/drivers/block/drbd/drbd_int.h
@@ -1725,7 +1725,7 @@ static inline void __drbd_chk_io_error_(struct drbd_conf *mdev, int forcedetach,
 	switch (mdev->ldev->dc.on_io_error) {
 	case EP_PASS_ON:
 		if (!forcedetach) {
-			if (printk_ratelimit())
+			if (__ratelimit(&drbd_ratelimit_state))
 				dev_err(DEV, "Local IO failed in %s."
 					     "Passing error on...\n", where);
 			break;
diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c
index c978557b4b80..6b077f93acc6 100644
--- a/trunk/drivers/block/drbd/drbd_main.c
+++ b/trunk/drivers/block/drbd/drbd_main.c
@@ -3783,7 +3783,7 @@ _drbd_insert_fault(struct drbd_conf *mdev, unsigned int type)
 	if (ret) {
 		fault_count++;
 
-		if (printk_ratelimit())
+		if (__ratelimit(&drbd_ratelimit_state))
 			dev_warn(DEV, "***Simulating %s failure\n",
 				_drbd_fault_str(type));
 	}