Merge branch 'akpm/master'

diff --cc fs/ext4/extents_status.c
index 91cb110da1b4fe6fe9e334073ddae337507cd5d6,db080c42eec25487256ecedf08bc0e5fa115dddc..87fd719b04f457c74ed798ec554ca0fd8646abd9
--- 1/fs/ext4/extents_status.c
--- 2/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
@@@ -964,7 -977,8 +977,8 @@@ static unsigned long __ext4_es_shrink(s
        return nr_shrunk;
  }
  
- static int ext4_es_shrink(struct shrinker *shrink, struct shrink_control *sc)
 -static unsigned long ext4_es_shrink(struct shrinker *shrink,
 -                                  struct shrink_control *sc)
++static unsigned long ext4_es_scan(struct shrinker *shrink,
++                                struct shrink_control *sc)
  {
        struct ext4_sb_info *sbi = container_of(shrink,
                                        struct ext4_sb_info, s_es_shrinker);
@@@ -979,9 -987,8 +987,8 @@@
  
        nr_shrunk = __ext4_es_shrink(sbi, nr_to_scan, NULL);
  
-       ret = percpu_counter_read_positive(&sbi->s_extent_cache_cnt);
--      trace_ext4_es_shrink_exit(sbi->s_sb, nr_shrunk, ret);
-       return ret;
++      trace_ext4_es_shrink_exit(sbi->s_sb, nr_shrunk);
+       return nr_shrunk;
  }
  
  void ext4_es_register_shrinker(struct ext4_sb_info *sbi)

diff --cc include/trace/events/ext4.h
index 2068db241f2204a44018f8af22225a952dd58c29,2068db241f2204a44018f8af22225a952dd58c29..e62c0d396eb0c4d89ffdb9f966d85b8ebaec93c8
--- 1/include/trace/events/ext4.h
--- 2/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@@ -2378,25 -2378,25 +2378,23 @@@ TRACE_EVENT(ext4_es_shrink_enter
  );
  
  TRACE_EVENT(ext4_es_shrink_exit,
--      TP_PROTO(struct super_block *sb, int shrunk_nr, int cache_cnt),
++      TP_PROTO(struct super_block *sb, unsigned long shrunk_nr),
  
--      TP_ARGS(sb, shrunk_nr, cache_cnt),
++      TP_ARGS(sb, shrunk_nr),
  
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
--              __field(        int,    shrunk_nr               )
--              __field(        int,    cache_cnt               )
++              __field(        unsigned long,  shrunk_nr       )
        ),
  
        TP_fast_assign(
                __entry->dev            = sb->s_dev;
                __entry->shrunk_nr      = shrunk_nr;
--              __entry->cache_cnt      = cache_cnt;
        ),
  
--      TP_printk("dev %d,%d shrunk_nr %d cache_cnt %d",
++      TP_printk("dev %d,%d shrunk_nr %lu",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
--                __entry->shrunk_nr, __entry->cache_cnt)
++                __entry->shrunk_nr)
  );
  
  #endif /* _TRACE_EXT4_H */