Hi Andrew,
After merging the akpm tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/ext4/extents_status.c: In function 'ext4_es_shrink':
fs/ext4/extents_status.c:990:50: error: 'ret' undeclared (first use in this function)
trace_ext4_es_shrink_exit(sbi->s_sb, nr_shrunk, ret);
^
fs/ext4/extents_status.c: In function 'ext4_es_register_shrinker':
fs/ext4/extents_status.c:999:36: error: 'ext4_es_scan' undeclared (first use in this function)
sbi->s_es_shrinker.scan_objects = ext4_es_scan;
^
A product of my conflict resolutions :-(
I applied the following fix patch:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 16 Jul 2013 15:12:34 +1000
Subject: [PATCH] fixup for ext4 and shrinker changes
Signe-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
fs/ext4/extents_status.c | 6 +++---
include/trace/events/ext4.h | 12 +++++-------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
index db080c4..87fd719 100644
--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
@@ -977,8 +977,8 @@ static unsigned long __ext4_es_shrink(struct ext4_sb_info *sbi, int nr_to_scan,
return nr_shrunk;
}
-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);
@@ -987,7 +987,7 @@ static unsigned long ext4_es_shrink(struct shrinker *shrink,
nr_shrunk = __ext4_es_shrink(sbi, nr_to_scan, NULL);
- trace_ext4_es_shrink_exit(sbi->s_sb, nr_shrunk, ret);
+ trace_ext4_es_shrink_exit(sbi->s_sb, nr_shrunk);
return nr_shrunk;
}
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 2068db2..e62c0d3 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -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 */
--
1.8.3.2
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpwMggfWocNE.pgp
Description: PGP signature
