Skip to contentSkip to conversation

lapi/name_to_handle_at.h: Fix compiler error on centos6

PATCH New Xiao Yang 4 participants 7 messages Nov 26, 2020

lore
Share & tools
lore

Xiao Yang

author
#0 lore raw

PATCH 1/1 lapi/name_to_handle_at.h: Fix compiler error on centos6

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.

---
 include/lapi/fcntl.h             | 4 ++++
 include/lapi/name_to_handle_at.h | 1 +
 2 files changed, 5 insertions(+)
include/lapi/fcntl.h +4 -0
index 576a18daf..d6665915f 100644
@@ -136,4 +136,8 @@
 # define SPLICE_F_NONBLOCK 2
 #endif
 
+#ifndef MAX_HANDLE_SZ
+# define MAX_HANDLE_SZ	128
+#endif
+
 #endif /* __LAPI_FCNTL_H__ */
include/lapi/name_to_handle_at.h +1 -0
index c0759c463..3484133d1 100644
@@ -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"
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 lapi/name_to_handle_at.h: Fix compiler error on centos6

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

Quoted 45 lines · Xiao Yang

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.

---
 include/lapi/fcntl.h             | 4 ++++
 include/lapi/name_to_handle_at.h | 1 +
 2 files changed, 5 insertions(+)
include/lapi/fcntl.h +4 -0
index 576a18daf..d6665915f 100644
@@ -136,4 +136,8 @@
 # define SPLICE_F_NONBLOCK 2
 #endif
 
+#ifndef MAX_HANDLE_SZ
+# define MAX_HANDLE_SZ 128
+#endif
+
 #endif /* __LAPI_FCNTL_H__ */
include/lapi/name_to_handle_at.h +1 -1
index c0759c463..3484133d1 100644
@@ -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

Signature · 5 lines
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20201126/62f14889/attachment.htm>
author
#2 lore raw

PATCH 1/1 lapi/name_to_handle_at.h: Fix compiler error on centos6

Quoted 7 lines · Li Wang

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

Quoted 40 lines

On Thu, Nov 26, 2020 at 9:49 AM Xiao Yang <[email protected] <mailto:[email protected]>> 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 <[email protected]
    <mailto:[email protected]>>
    ---
     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"
Quoted 14 lines
    -- 
    2.25.1




    -- 
    Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 2 lines
Regards,
Li Wang

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20201126/8416976b/attachment-0001.htm>

#3 lore raw

PATCH 1/1 lapi/name_to_handle_at.h: Fix compiler error on centos6

Quoted 7 lines · Xiao Yang

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.

Quoted 8 lines

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 <[email protected]> @Cyril Hrubis <[email protected]> what do you think?

Quoted 6 lines

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.

Signature · 5 lines
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20201126/73de7ef7/attachment.htm>
#4 lore raw

PATCH 1/1 lapi/name_to_handle_at.h: Fix compiler error on centos6

Hi!

Quoted 4 lines

As discussed in the previous mail, it should be accomplished in the current release 20200930.
@Petr Vorel <[email protected]> @Cyril Hrubis <[email protected]> what do you think?

Unless anybody objects I would go for it. I guess that first step would be removign CentOS6 from travis.

Signature · 2 lines
Cyril Hrubis
[email protected]
#5 lore raw

PATCH 1/1 lapi/name_to_handle_at.h: Fix compiler error on centos6

Hi,

Quoted 7 lines
Quoted 4 lines

As discussed in the previous mail, it should be accomplished in the current release 20200930.
@Petr Vorel <[email protected]> @Cyril Hrubis <[email protected]> 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

author
#6 lore raw

PATCH 1/1 lapi/name_to_handle_at.h: Fix compiler error on centos6

Quoted 10 lines · Petr Vorel

Hi,

Quoted 6 lines
Quoted 4 lines

As discussed in the previous mail, it should be accomplished in the current release 20200930.
@Petr Vorel<[email protected]> @Cyril Hrubis<[email protected]> 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

Quoted 6 lines

Kind regards,
Petr

.