summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-06-07 10:08:26 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2013-06-07 15:42:33 +1000
commit80b1ed62862c9e23d3e38ef5d5d5189ad95586db (patch)
treec4690a0338363f8e93fb924eca8f3add9aa37071 /fs
parentd1b1b34b98a1092c34e13d0c0f637355b0a006be (diff)
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 <dchinner@redhat.com> Cc: Glauber Costa <glommer@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/super.c6
1 files changed, 4 insertions, 2 deletions
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;