[LTP] [PATCH] mount/mount06.c: fix a compile error

DAN LI

author

2013-07-30 03:32 UTC #0 lore raw

PATCH 1/1 mount/mount06.c: fix a compile error

The definitions of MS_PRIVATE and MS_MOVE were only added to glibc headers in version 2.12.

If the version of glibc is older than 2.12, define these two flags.

Signed-off-by DAN LI <[email protected]>

---
 testcases/kernel/syscalls/mount/mount06.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

testcases/kernel/syscalls/mount/mount06.c +5 -0

index acfb22d..ab1a472 100644
@@ -31,6 +31,11 @@
 #include "usctest.h"
 #include "safe_macros.h"
 
+#if !(__GLIBC_PREREQ(2, 12))
+#define MS_MOVE	8192
+#define MS_PRIVATE	(1 << 18)
+#endif
+
 #define MNTPOINT_SRC	"mnt_src"
 #define MNTPOINT_DES	"mnt_des"
 #define LINELENGTH	256

Signature · 12 lines

1.7.1

------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent 
caught up. So what steps can you take to put your SQL databases under 
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Wanlong Gao

2013-07-30 03:40 UTC #1 lore raw

Quoted 16 lines · DAN LI

The definitions of MS_PRIVATE and MS_MOVE were only added to glibc headers in version 2.12.
If the version of glibc is older than 2.12, define these two flags.
Signed-off-by DAN LI <[email protected]>
---
 testcases/kernel/syscalls/mount/mount06.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
testcases/kernel/syscalls/mount/mount06.c +0 -0
index acfb22d..ab1a472 100644

testcases/kernel/syscalls/mount/mount06.c line 34

Quoted 4 lines

testcases/kernel/syscalls/mount/mount06.c +1 -0

@@ -31,6 +31,11 @@
 #include "usctest.h"
 #include "safe_macros.h"
 
+#if !(__GLIBC_PREREQ(2, 12))

Why not do like below?
#ifndef MS_MOVE
#define xxx
#define xxx
#endif

Wanlong Gao

testcases/kernel/syscalls/mount/mount06.c line 41

Quoted 8 lines

testcases/kernel/syscalls/mount/mount06.c +4 -0

+#define MS_MOVE	8192
+#define MS_PRIVATE	(1 << 18)
+#endif
+
 #define MNTPOINT_SRC	"mnt_src"
 #define MNTPOINT_DES	"mnt_des"
 #define LINELENGTH	256

------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

DAN LI

author

2013-07-30 04:17 UTC #2 lore raw

Quoted 20 lines · Wanlong Gao

Quoted 19 lines · DAN LI
The definitions of MS_PRIVATE and MS_MOVE were only added to glibc headers in version 2.12.
If the version of glibc is older than 2.12, define these two flags.
Signed-off-by DAN LI <[email protected]>
---
 testcases/kernel/syscalls/mount/mount06.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
testcases/kernel/syscalls/mount/mount06.c +0 -0
index acfb22d..ab1a472 100644
@@ -31,6 +31,11 @@
 #include "usctest.h"
 #include "safe_macros.h"
 

Quoted 3 lines

testcases/kernel/syscalls/mount/mount06.c line 34
Quoted 1 line
testcases/kernel/syscalls/mount/mount06.c +1 -0
+#if !(__GLIBC_PREREQ(2, 12))
Why not do like below?

I think it also clearly shows the reason why this definition should exist here(glibc version related).

Regards,
DAN LI

Quoted 7 lines

#ifndef MS_MOVE
#define xxx
#define xxx
#endif
Wanlong Gao

Quoted 10 lines

testcases/kernel/syscalls/mount/mount06.c line 41
Quoted 8 lines
testcases/kernel/syscalls/mount/mount06.c +4 -0
+#define MS_MOVE	8192
+#define MS_PRIVATE	(1 << 18)
+#endif
+
 #define MNTPOINT_SRC	"mnt_src"
 #define MNTPOINT_DES	"mnt_des"
 #define LINELENGTH	256

------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Benoit Marcot

2013-07-30 08:19 UTC #3 lore raw

Hi!

I had the same problem to compile the latest commits; I patched in the same way as testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c:

#ifndef MS_MOVE
#define MS_MOVE 8192
#endif

Benoit

Quoted 59 lines

-----Original Message-----
From: DAN LI [mailto:[email protected]]
Sent: 30 July 2013 05:16
To: [email protected]
Cc: LTP list
Subject: Re: [LTP] [PATCH] mount/mount06.c: fix a compile error
Quoted 21 lines · Wanlong Gao
Quoted 20 lines · DAN LI
The definitions of MS_PRIVATE and MS_MOVE were only added to glibc headers in version 2.12.
If the version of glibc is older than 2.12, define these two flags.
Signed-off-by DAN LI <[email protected]>
---
 testcases/kernel/syscalls/mount/mount06.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
testcases/kernel/syscalls/mount/mount06.c +0 -0
index acfb22d..ab1a472 100644
@@ -31,6 +31,11 @@
 #include "usctest.h"
 #include "safe_macros.h"
 
Quoted 3 lines
testcases/kernel/syscalls/mount/mount06.c line 34
Quoted 1 line
testcases/kernel/syscalls/mount/mount06.c +1 -0
+#if !(__GLIBC_PREREQ(2, 12))
Why not do like below?
I think it also clearly shows the reason why this definition should exist here(glibc version related).
Regards,
DAN LI
Quoted 7 lines
#ifndef MS_MOVE
#define xxx
#define xxx
#endif
Wanlong Gao
Quoted 10 lines
testcases/kernel/syscalls/mount/mount06.c line 41
Quoted 8 lines
testcases/kernel/syscalls/mount/mount06.c +4 -0
+#define MS_MOVE   8192
+#define MS_PRIVATE        (1 << 18)
+#endif
+
 #define MNTPOINT_SRC      "mnt_src"
 #define MNTPOINT_DES      "mnt_des"
 #define LINELENGTH        256

Quoted 11 lines

------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clk
trk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Benoit Marcot

2013-07-30 08:33 UTC #4 lore raw

In the other hand Dan's patch gives a hint about *why* it's failing to compile, which is nice.

Quoted 98 lines

-----Original Message-----
From: Benoit Marcot [mailto:[email protected]]
Sent: 30 July 2013 09:19
To: DAN LI; [email protected]
Cc: LTP list
Subject: Re: [LTP] [PATCH] mount/mount06.c: fix a compile error
Hi!
I had the same problem to compile the latest commits; I patched in the same way as testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c:
#ifndef MS_MOVE
#define MS_MOVE 8192
#endif
Benoit
Quoted 59 lines
-----Original Message-----
From: DAN LI [mailto:[email protected]]
Sent: 30 July 2013 05:16
To: [email protected]
Cc: LTP list
Subject: Re: [LTP] [PATCH] mount/mount06.c: fix a compile error
Quoted 21 lines · Wanlong Gao
Quoted 20 lines · DAN LI
The definitions of MS_PRIVATE and MS_MOVE were only added to glibc headers in version 2.12.
If the version of glibc is older than 2.12, define these two flags.
Signed-off-by DAN LI <[email protected]>
---
 testcases/kernel/syscalls/mount/mount06.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
testcases/kernel/syscalls/mount/mount06.c +0 -0
index acfb22d..ab1a472 100644
@@ -31,6 +31,11 @@
 #include "usctest.h"
 #include "safe_macros.h"
 
Quoted 3 lines
testcases/kernel/syscalls/mount/mount06.c line 34
Quoted 1 line
testcases/kernel/syscalls/mount/mount06.c +1 -0
+#if !(__GLIBC_PREREQ(2, 12))
Why not do like below?
I think it also clearly shows the reason why this definition should exist here(glibc version related).
Regards,
DAN LI
Quoted 7 lines
#ifndef MS_MOVE
#define xxx
#define xxx
#endif
Wanlong Gao
Quoted 10 lines
testcases/kernel/syscalls/mount/mount06.c line 41
Quoted 8 lines
testcases/kernel/syscalls/mount/mount06.c +4 -0
+#define MS_MOVE   8192
+#define MS_PRIVATE        (1 << 18)
+#endif
+
 #define MNTPOINT_SRC      "mnt_src"
 #define MNTPOINT_DES      "mnt_des"
 #define LINELENGTH        256
Quoted 12 lines
----------------------------------------------------------------------
-------- Get your SQL database under version control now! Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.c
lk
trk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Quoted 11 lines

------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clk
trk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

[email protected]

2013-07-30 09:59 UTC #5 lore raw

In reply to DAN LI

Hi!

Quoted 18 lines

Quoted 18 lines
Quoted 18 lines
The definitions of MS_PRIVATE and MS_MOVE were only added to glibc headers in version 2.12.
If the version of glibc is older than 2.12, define these two flags.
Signed-off-by DAN LI <[email protected]>
---
 testcases/kernel/syscalls/mount/mount06.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
testcases/kernel/syscalls/mount/mount06.c +0 -0
index acfb22d..ab1a472 100644
@@ -31,6 +31,11 @@
 #include "usctest.h"
 #include "safe_macros.h"
 

Quoted 6 lines

Quoted 3 lines
testcases/kernel/syscalls/mount/mount06.c line 34
Quoted 1 line
testcases/kernel/syscalls/mount/mount06.c +1 -0
+#if !(__GLIBC_PREREQ(2, 12))
Why not do like below?
I think it also clearly shows the reason why this definition should exist here(glibc version related).

Well the same is told in the git commit log anyway.
(Which is the place where people should look for verbose description of
changes.)

And this kind of code may break with different libc implementation where there is no __GLIBC_PREREQ() macro.

So I vote for the:

#ifndef FOO

# define FOO xyz
#endif

Signature · 13 lines

Cyril Hrubis
[email protected]

------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent 
caught up. So what steps can you take to put your SQL databases under 
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list