Re: [LTP] [PATCH] fix fanotify syscall (again)

[chrubis@suse.cz]

Hi!
> diff --git a/testcases/kernel/syscalls/fanotify/fanotify.h b/testcases/kernel/syscalls/fanotify/fanotify.h
> index a52093c..6625811 100644
> --- a/testcases/kernel/syscalls/fanotify/fanotify.h
> +++ b/testcases/kernel/syscalls/fanotify/fanotify.h
> @@ -28,27 +28,43 @@
>  #ifndef	__FANOTIFY_H__
>  #define	__FANOTIFY_H__
>  
> +#include "config.h"
> +
>  #include <stdint.h>
> -#include <endian.h>
> -#include "lapi/abisize.h"
>  #include "linux_syscall_numbers.h"
>  
>  /* fanotify(7) wrappers */
>  
> -#define	myfanotify_init(flags, event_f_flags) \
> -	syscall(__NR_fanotify_init, flags, event_f_flags)
>  
> -long myfanotify_mark(int fd, unsigned int flags, uint64_t mask,
> +#if defined(HAVE_SYS_FANOTIFY_H)
> +
> +#include <sys/fanotify.h>
> +
> +static int myfanotify_init(unsigned int flags, unsigned int event_f_flags)
> +{
> +	return fanotify_init(flags, event_f_flags);
> +}
> +static long myfanotify_mark(int fd, unsigned int flags, uint64_t mask,
>                       int dfd, const char *pathname)
>  {
> -#if LTP_USE_64_ABI
> -	return ltp_syscall(__NR_fanotify_mark, fd, flags, mask, dfd, pathname);
> -#else
> -	return ltp_syscall(__NR_fanotify_mark, fd, flags,
> -			 __LONG_LONG_PAIR((unsigned long) (mask >> 32),
> -					  (unsigned long) mask),
> -			 dfd, (unsigned long) pathname);
> -#endif
> +	return fanotify_mark(fd, flags, mask, dfd, pathname);
> +}

What about we drop the myfanotify*() functions now since we check if
fanotify.h exists now, use fanotify*() in the testcases and define the
syscall wrappers only when fanotify.h is not available (see for example
include/lapi/renameat.h)?

Otherwise it looks fine to me.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list