|
@@ -65,6 +65,7 @@
|
|
|
#include <linux/libata.h>
|
|
|
#include <asm/byteorder.h>
|
|
|
#include <linux/cdrom.h>
|
|
|
+#include <linux/ratelimit.h>
|
|
|
|
|
|
#include "libata.h"
|
|
|
|
|
@@ -6706,25 +6707,11 @@ static void __exit ata_exit(void)
|
|
|
subsys_initcall(ata_init);
|
|
|
module_exit(ata_exit);
|
|
|
|
|
|
-static unsigned long ratelimit_time;
|
|
|
-static DEFINE_SPINLOCK(ata_ratelimit_lock);
|
|
|
+static DEFINE_RATELIMIT_STATE(ratelimit, HZ / 5, 1);
|
|
|
|
|
|
int ata_ratelimit(void)
|
|
|
{
|
|
|
- int rc;
|
|
|
- unsigned long flags;
|
|
|
-
|
|
|
- spin_lock_irqsave(&ata_ratelimit_lock, flags);
|
|
|
-
|
|
|
- if (time_after(jiffies, ratelimit_time)) {
|
|
|
- rc = 1;
|
|
|
- ratelimit_time = jiffies + (HZ/5);
|
|
|
- } else
|
|
|
- rc = 0;
|
|
|
-
|
|
|
- spin_unlock_irqrestore(&ata_ratelimit_lock, flags);
|
|
|
-
|
|
|
- return rc;
|
|
|
+ return __ratelimit(&ratelimit);
|
|
|
}
|
|
|
|
|
|
/**
|