diff --git a/[refs] b/[refs]
index f8aa6f9dae65..5256536cdcbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48e03bc515cff75718de5460458680a230ae997e
+refs/heads/master: 6aad89c8376e432231b78d1bdbcc10ef7708b011
diff --git a/trunk/net/sunrpc/cache.c b/trunk/net/sunrpc/cache.c
index 20029a79a5de..ff0c23053d2f 100644
--- a/trunk/net/sunrpc/cache.c
+++ b/trunk/net/sunrpc/cache.c
@@ -488,7 +488,7 @@ static void do_cache_clean(struct work_struct *work)
 {
 	int delay = 5;
 	if (cache_clean() == -1)
-		delay = 30*HZ;
+		delay = round_jiffies_relative(30*HZ);
 
 	if (list_empty(&cache_list))
 		delay = 0;