[PATCH] SUNRPC auth: add context argument to shrinker callback

[PATCH] SUNRPC auth: add context argument to shrinker callback

[Marc Kleine-Budde]

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 <mkl@pengutronix.de>
---
 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

Re: [PATCH] SUNRPC auth: add context argument to shrinker callback

[Dave Chinner]

On Wed, Jul 21, 2010 at 09:41:35AM +0200, Marc Kleine-Budde wrote:
> Hello,
> 
> I found this regression in the current mainline tree.

The fix is already in Linus' current git tree (commit
567c7b0edec0200c5c6613f07c3d3b4034fdc836 ("mm: add context argument to
shrinker callback to remaining shrinkers"). Thanks for catching
it, anyway.

Cheers,

Dave.
-- 
Dave Chinner
dchinner@redhat.com

Re: [PATCH] SUNRPC auth: add context argument to shrinker callback

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]

Dave Chinner wrote:
> On Wed, Jul 21, 2010 at 09:41:35AM +0200, Marc Kleine-Budde wrote:
>> Hello,
>>
>> I found this regression in the current mainline tree.
> 
> The fix is already in Linus' current git tree (commit
> 567c7b0edec0200c5c6613f07c3d3b4034fdc836 ("mm: add context argument to
> shrinker callback to remaining shrinkers"). Thanks for catching
> it, anyway.

After pulling yesterday I noticed the warning was gone.

BTW: Do you know Coccinelle[1]? It's a semantic patch tool, this is
exactly what you need if you change function signatures, etc....

Wolfram has written a very good lwn article[2] about it.

cheers,
Marc

[1] http://coccinelle.lip6.fr/
[2] http://lwn.net/Articles/380835/
-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 260 bytes --]