From: Andrew Morton Date: Thu, 27 Jun 2013 23:52:13 +0000 (+1000) Subject: shrinker-convert-superblock-shrinkers-to-new-api-fix X-Git-Tag: next-20130628~3^2~421 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=27f6725dbe8a2aae11994694f37a619b77f5aed4;p=karo-tx-linux.git shrinker-convert-superblock-shrinkers-to-new-api-fix fix warnings fs/super.c: In function 'alloc_super': fs/super.c:240: warning: assignment from incompatible pointer type fs/super.c:241: warning: assignment from incompatible pointer type Cc: Dave Chinner Cc: Glauber Costa Signed-off-by: Andrew Morton --- diff --git a/fs/super.c b/fs/super.c index 86801eb2555e..00375e8de4ef 100644 --- a/fs/super.c +++ b/fs/super.c @@ -53,7 +53,8 @@ static char *sb_writers_name[SB_FREEZE_LEVELS] = { * shrinker path and that leads to deadlock on the shrinker_rwsem. Hence we * take a passive reference to the superblock to avoid this from occurring. */ -static long super_cache_scan(struct shrinker *shrink, struct shrink_control *sc) +static unsigned long super_cache_scan(struct shrinker *shrink, + struct shrink_control *sc) { struct super_block *sb; long fs_objects = 0; @@ -103,7 +104,8 @@ static long super_cache_scan(struct shrinker *shrink, struct shrink_control *sc) return freed; } -static long super_cache_count(struct shrinker *shrink, struct shrink_control *sc) +static unsigned long super_cache_count(struct shrinker *shrink, + struct shrink_control *sc) { struct super_block *sb; long total_objects = 0;