diff mbox series

lapi/name_to_handle_at.h: Fix compiler error on centos6

Message ID 20201126012838.531070-1-yangx.jy@cn.fujitsu.com
State Accepted
Headers show
Series lapi/name_to_handle_at.h: Fix compiler error on centos6 | expand

Commit Message

Xiao Yang Nov. 26, 2020, 1:28 a.m. UTC
From travis-ci, compiling name_to_handle_at/open_by_handle_at tests
failed on centos6 due to undefined AT_EMPTY_PATH and MAX_HANDLE_SZ.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 include/lapi/fcntl.h             | 4 ++++
 include/lapi/name_to_handle_at.h | 1 +
 2 files changed, 5 insertions(+)

Comments

Li Wang Nov. 26, 2020, 4:33 a.m. UTC | #1
Hi Xiao,

The patch itself looks good, but I remember we were planning to
drop support for the old distro e.g CentOS6.

The previous discussion here:
http://lists.linux.it/pipermail/ltp/2020-March/016164.html

On Thu, Nov 26, 2020 at 9:49 AM Xiao Yang <yangx.jy@cn.fujitsu.com> wrote:

> From travis-ci, compiling name_to_handle_at/open_by_handle_at tests
> failed on centos6 due to undefined AT_EMPTY_PATH and MAX_HANDLE_SZ.
>
> Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
> ---
>  include/lapi/fcntl.h             | 4 ++++
>  include/lapi/name_to_handle_at.h | 1 +
>  2 files changed, 5 insertions(+)
>
> diff --git a/include/lapi/fcntl.h b/include/lapi/fcntl.h
> index 576a18daf..d6665915f 100644
> --- a/include/lapi/fcntl.h
> +++ b/include/lapi/fcntl.h
> @@ -136,4 +136,8 @@
>  # define SPLICE_F_NONBLOCK 2
>  #endif
>
> +#ifndef MAX_HANDLE_SZ
> +# define MAX_HANDLE_SZ 128
> +#endif
> +
>  #endif /* __LAPI_FCNTL_H__ */
> diff --git a/include/lapi/name_to_handle_at.h
> b/include/lapi/name_to_handle_at.h
> index c0759c463..3484133d1 100644
> --- a/include/lapi/name_to_handle_at.h
> +++ b/include/lapi/name_to_handle_at.h
> @@ -10,6 +10,7 @@
>  #include <sys/syscall.h>
>  #include "config.h"
>  #include "lapi/syscalls.h"
> +#include "lapi/fcntl.h"
>  #include "tst_buffers.h"
>  #include "tst_test.h"
>
> --
> 2.25.1
>
>
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
>
>
Xiao Yang Nov. 26, 2020, 5:16 a.m. UTC | #2
On 2020/11/26 12:33, Li Wang wrote:
> Hi Xiao,
>
> The patch itself looks good, but I remember we were planning to 
> drop support for the old distro e.g CentOS6.
>
> The previous discussion here:
> http://lists.linux.it/pipermail/ltp/2020-March/016164.html
Hi Li,

Thanks for sharing the infomation.
When do you plan to remove old distro? next release?

BTW:
It may also resolve the compiler error on uclibc as Fabrice Fontaine 
reported before:
https://github.com/linux-test-project/ltp/commit/cb11e718ce04261cb6ff4c09442b949da33b8797

Best Regards,
Xiao Yang
>
> On Thu, Nov 26, 2020 at 9:49 AM Xiao Yang <yangx.jy@cn.fujitsu.com 
> <mailto:yangx.jy@cn.fujitsu.com>> wrote:
>
>     From travis-ci, compiling name_to_handle_at/open_by_handle_at tests
>     failed on centos6 due to undefined AT_EMPTY_PATH and MAX_HANDLE_SZ.
>
>     Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com
>     <mailto:yangx.jy@cn.fujitsu.com>>
>     ---
>      include/lapi/fcntl.h             | 4 ++++
>      include/lapi/name_to_handle_at.h | 1 +
>      2 files changed, 5 insertions(+)
>
>     diff --git a/include/lapi/fcntl.h b/include/lapi/fcntl.h
>     index 576a18daf..d6665915f 100644
>     --- a/include/lapi/fcntl.h
>     +++ b/include/lapi/fcntl.h
>     @@ -136,4 +136,8 @@
>      # define SPLICE_F_NONBLOCK 2
>      #endif
>
>     +#ifndef MAX_HANDLE_SZ
>     +# define MAX_HANDLE_SZ 128
>     +#endif
>     +
>      #endif /* __LAPI_FCNTL_H__ */
>     diff --git a/include/lapi/name_to_handle_at.h
>     b/include/lapi/name_to_handle_at.h
>     index c0759c463..3484133d1 100644
>     --- a/include/lapi/name_to_handle_at.h
>     +++ b/include/lapi/name_to_handle_at.h
>     @@ -10,6 +10,7 @@
>      #include <sys/syscall.h>
>      #include "config.h"
>      #include "lapi/syscalls.h"
>     +#include "lapi/fcntl.h"
>      #include "tst_buffers.h"
>      #include "tst_test.h"
>
>     -- 
>     2.25.1
>
>
>
>
>     -- 
>     Mailing list info: https://lists.linux.it/listinfo/ltp
>
>
>
> -- 
> Regards,
> Li Wang
Li Wang Nov. 26, 2020, 6:47 a.m. UTC | #3
On Thu, Nov 26, 2020 at 1:16 PM Xiao Yang <yangx.jy@cn.fujitsu.com> wrote:

> On 2020/11/26 12:33, Li Wang wrote:
>
> Hi Xiao,
>
> The patch itself looks good, but I remember we were planning to
> drop support for the old distro e.g CentOS6.
>
> The previous discussion here:
> http://lists.linux.it/pipermail/ltp/2020-March/016164.html
>
> Hi Li,
>
> Thanks for sharing the infomation.
> When do you plan to remove old distro? next release?
>

As discussed in the previous mail, it should be accomplished in the current
release 20200930.
@Petr Vorel <pvorel@suse.cz>  @Cyril Hrubis <chrubis@suse.cz> what do you
think?


> BTW:
> It may also resolve the compiler error on uclibc as Fabrice Fontaine
> reported before:
>
> https://github.com/linux-test-project/ltp/commit/cb11e718ce04261cb6ff4c09442b949da33b8797
>

Thanks, I helped merge this one since CentOS6 is still supported in
Travis-CI now.
Cyril Hrubis Nov. 26, 2020, 9:19 a.m. UTC | #4
Hi!
> As discussed in the previous mail, it should be accomplished in the current
> release 20200930.
> @Petr Vorel <pvorel@suse.cz>  @Cyril Hrubis <chrubis@suse.cz> what do you
> think?

Unless anybody objects I would go for it. I guess that first step would
be removign CentOS6 from travis.
Petr Vorel Nov. 26, 2020, 9:23 a.m. UTC | #5
Hi,

> > As discussed in the previous mail, it should be accomplished in the current
> > release 20200930.
> > @Petr Vorel <pvorel@suse.cz>  @Cyril Hrubis <chrubis@suse.cz> what do you
> > think?

> Unless anybody objects I would go for it. I guess that first step would
> be removign CentOS6 from travis.
ack from my side as well.
Feel free to remove it from Travis.

Kind regards,
Petr
Xiao Yang Nov. 26, 2020, 10:33 a.m. UTC | #6
On 2020/11/26 17:23, Petr Vorel wrote:
> Hi,
>
>>> As discussed in the previous mail, it should be accomplished in the current
>>> release 20200930.
>>> @Petr Vorel<pvorel@suse.cz>   @Cyril Hrubis<chrubis@suse.cz>  what do you
>>> think?
>> Unless anybody objects I would go for it. I guess that first step would
>> be removign CentOS6 from travis.
> ack from my side as well.
> Feel free to remove it from Travis.
Hi,

OK, I will send a patch to remove it now.

Thanks,
Xiao Yang
> Kind regards,
> Petr
>
>
> .
>
diff mbox series

Patch

diff --git a/include/lapi/fcntl.h b/include/lapi/fcntl.h
index 576a18daf..d6665915f 100644
--- a/include/lapi/fcntl.h
+++ b/include/lapi/fcntl.h
@@ -136,4 +136,8 @@ 
 # define SPLICE_F_NONBLOCK 2
 #endif
 
+#ifndef MAX_HANDLE_SZ
+# define MAX_HANDLE_SZ	128
+#endif
+
 #endif /* __LAPI_FCNTL_H__ */
diff --git a/include/lapi/name_to_handle_at.h b/include/lapi/name_to_handle_at.h
index c0759c463..3484133d1 100644
--- a/include/lapi/name_to_handle_at.h
+++ b/include/lapi/name_to_handle_at.h
@@ -10,6 +10,7 @@ 
 #include <sys/syscall.h>
 #include "config.h"
 #include "lapi/syscalls.h"
+#include "lapi/fcntl.h"
 #include "tst_buffers.h"
 #include "tst_test.h"