From 101c1759f4543d3e79b6ab14b6afc7061b625870 Mon Sep 17 00:00:00 2001 From: Thomas Schoebel-Theuer Date: Wed, 29 Jul 2015 09:49:34 +0200 Subject: [PATCH] infra: remove __HAS_NEW_FILLDIR_T from upstream --- kernel/sy_old/sy_generic.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/sy_old/sy_generic.c b/kernel/sy_old/sy_generic.c index fb9fcf19..1d830f23 100644 --- a/kernel/sy_old/sy_generic.c +++ b/kernel/sy_old/sy_generic.c @@ -1036,14 +1036,18 @@ struct mars_dir_context { #endif // end_remove_this +// remove_this #ifdef __HAS_NEW_FILLDIR_T +// end_remove_this int mars_filler(struct dir_context *__buf, const char *name, int namlen, loff_t offset, u64 ino, unsigned int d_type) +// remove_this #else static int mars_filler(void *__buf, const char *name, int namlen, loff_t offset, u64 ino, unsigned int d_type) #endif +// end_remove_this { // remove_this #ifdef HAS_VFS_READDIR