diff --git a/[refs] b/[refs]
index 99d6fe166d10..162fc1a6bf92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20c8c62891a346e09c8d26de41ce78bd7a76c5b0
+refs/heads/master: 09f363c7363eb10cfb4b82094bd7064e5608258b
diff --git a/trunk/fs/super.c b/trunk/fs/super.c
index 3f56a269a4f4..32a81f3467e0 100644
--- a/trunk/fs/super.c
+++ b/trunk/fs/super.c
@@ -61,7 +61,7 @@ static int prune_super(struct shrinker *shrink, struct shrink_control *sc)
 		return -1;
 
 	if (!grab_super_passive(sb))
-		return -1;
+		return !sc->nr_to_scan ? 0 : -1;
 
 	if (sb->s_op && sb->s_op->nr_cached_objects)
 		fs_objects = sb->s_op->nr_cached_objects(sb);
diff --git a/trunk/include/linux/shrinker.h b/trunk/include/linux/shrinker.h
index 790651b4e5ba..a83833a1f7a2 100644
--- a/trunk/include/linux/shrinker.h
+++ b/trunk/include/linux/shrinker.h
@@ -20,6 +20,7 @@ struct shrink_control {
  * 'nr_to_scan' entries and attempt to free them up.  It should return
  * the number of objects which remain in the cache.  If it returns -1, it means
  * it cannot do any scanning at this time (eg. there is a risk of deadlock).
+ * The callback must not return -1 if nr_to_scan is zero.
  *
  * The 'gfpmask' refers to the allocation we are currently trying to
  * fulfil.