From: Marc Kleine-Budde Subject: [PATCH] SUNRPC auth: add context argument to shrinker callback Date: Wed, 21 Jul 2010 09:41:35 +0200 Message-ID: <1279698095-17287-1-git-send-email-mkl@pengutronix.de> Cc: Dave Chinner , linux-kernel@vger.kernel.org, Trond Myklebust , "J. Bruce Fields" , Marc Kleine-Budde To: linux-nfs@vger.kernel.org Return-path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:46529 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752799Ab0GUHlq (ORCPT ); Wed, 21 Jul 2010 03:41:46 -0400 Sender: linux-nfs-owner@vger.kernel.org List-ID: Hello, I found this regression in the current mainline tree. Please review, Marc ---------8<--------8<--------8<--------8<--------8<--------8<--------8<------- This patch fixes a regression introduced with commit 7f8275d0d660c146de6ee3017e1e2e594c49e820, the signature of the shrinker callback has been changes, but this file has not been modified. This results in the following compiler warning: net/sunrpc/auth.c:586: warning: initialization from incompatible pointer type Signed-off-by: Marc Kleine-Budde --- net/sunrpc/auth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 73affb8..8dc47f1 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -267,7 +267,7 @@ rpcauth_prune_expired(struct list_head *free, int nr_to_scan) * Run memory cache shrinker. */ static int -rpcauth_cache_shrinker(int nr_to_scan, gfp_t gfp_mask) +rpcauth_cache_shrinker(struct shrinker *shrink, int nr_to_scan, gfp_t gfp_mask) { LIST_HEAD(free); int res; -- 1.7.1