Fix fallocate() build issue for EXT4 Online Defragmentation Test

Earlier Subject: Re: [LTP] ext4/e4defrag.c testcases compilation error,

Hi Garret/Miao,

On PPC systems, fallocate() seems to be already defined at /usr/include/bits/fcntl.h, so building EXT4 test cases on PPC64 machines will create build problems even if the pre-requisite packages:

e2fsprogs*
e2fsprogs-libs*
e2fsprogs-devel*

are present. So, this patch adds an extra check. Please let me know your thoughts.

Errors bound to occur:
[
gcc -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall  -I/root/subrata/ltp/ltp-dev/testcases/kernel/include -I../../../../../include -I../../../../../include   -L../../../../../lib  e4defrag.c   -lltp -lm -o e4defrag e4defrag.c:388: error: conflicting types for ‘fallocate’
/usr/include/bits/fcntl.h:240: note: previous declaration of ‘fallocate’ was here
make[1]: *** [e4defrag] Error 1
]

Signed-off-by Subrata Modak <[email protected]>

---

Quoted 36 lines · Subrata Modak

Earlier Subject: Re: [LTP] ext4/e4defrag.c testcases compilation error,

Hi Garret/Miao,

On PPC systems, fallocate() seems to be already defined at /usr/include/bits/fcntl.h, so building EXT4 test cases on PPC64 machines will create build problems even if the pre-requisite packages:

e2fsprogs*
e2fsprogs-libs*
e2fsprogs-devel*

are present. So, this patch adds an extra check. Please let me know your thoughts.

Errors bound to occur:
[
gcc -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall -I/root/subrata/ltp/ltp-dev/testcases/kernel/include -I../../../../../include -I../../../../../include -L../../../../../lib e4defrag.c -lltp -lm -o e4defrag
e4defrag.c:388: error: conflicting types for ‘fallocate’ /usr/include/bits/fcntl.h:240: note: previous declaration of ‘fallocate’ was here make[1]: *** [e4defrag] Error 1
]

Signed-off-by Subrata Modak <[email protected]>

---

testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c 2010-03-24 18:09:14.336793513 +0530 renamed from testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c 2010-03-15 19:32:12.000000000 +0530 +2 -0

@@ -383,10 +383,13 @@ int sync_file_range(int fd, loff_t offse
 * @offset:            file offset.
 * @len:               file size.
 */
+
+#ifndef __NR_fallocate
 int fallocate(int fd, int mode, loff_t offset, loff_t len)
 {
       return syscall(__NR_fallocate, fd, mode, offset, len);

testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c 2010-03-24 18:09:14.336793513 +0530 int sync_file_range(int fd, loff_t offse · line 392

Quoted 2 lines

testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c 2010-03-24 18:09:14.336793513 +0530 renamed from testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c 2010-03-15 19:32:12.000000000 +0530 +1 -0

 }
+#endif

If it's not defined, you're definitely in trouble because that
will result in a compile error. An autoconf test should be added for this syscall, and/or linux_syscall_numbers.h should be integrated into this test. That may be a bit heavy handed because that will integrate some libltp pieces into the tests, but that's up to Miao to decide.

Thanks,
-Garrett

Miao,

Quoted 38 lines · Garrett Cooper

Quoted 36 lines · Subrata Modak

Earlier Subject: Re: [LTP] ext4/e4defrag.c testcases compilation error,

Hi Garret/Miao,

On PPC systems, fallocate() seems to be already defined at /usr/include/bits/fcntl.h, so building EXT4 test cases on PPC64 machines will create build problems even if the pre-requisite packages:

e2fsprogs*
e2fsprogs-libs*
e2fsprogs-devel*

are present. So, this patch adds an extra check. Please let me know your thoughts.

Errors bound to occur:
[
gcc -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall  -I/root/subrata/ltp/ltp-dev/testcases/kernel/include -I../../../../../include -I../../../../../include   -L../../../../../lib  e4defrag.c   -lltp -lm -o e4defrag e4defrag.c:388: error: conflicting types for ‘fallocate’
/usr/include/bits/fcntl.h:240: note: previous declaration of ‘fallocate’ was here
make[1]: *** [e4defrag] Error 1
]

Signed-off-by Subrata Modak <[email protected]>

---

testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c        2010-03-24 18:09:14.336793513 +0530 renamed from testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c 2010-03-15 19:32:12.000000000 +0530 +2 -0

@@ -383,10 +383,13 @@ int sync_file_range(int fd, loff_t offse
  * @offset:            file offset.
  * @len:               file size.
  */
+
+#ifndef __NR_fallocate
  int fallocate(int fd, int mode, loff_t offset, loff_t len)
  {
        return syscall(__NR_fallocate, fd, mode, offset, len);

Quoted 8 lines

testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c        2010-03-24 18:09:14.336793513 +0530 int sync_file_range(int fd, loff_t offse · line 392

Quoted 2 lines

testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c        2010-03-24 18:09:14.336793513 +0530 renamed from testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c 2010-03-15 19:32:12.000000000 +0530 +1 -0

  }
+#endif

    If it's not defined, you're definitely in trouble because that will result in a compile error. An autoconf test should be added for this syscall, and/or linux_syscall_numbers.h should be integrated into this test. That may be a bit heavy handed because that will integrate some libltp pieces into the tests, but that's up to Miao to decide.

Did you get a chance to check this patch ?

Regards--
Subrata

Quoted 36 lines

Quoted 36 lines

Earlier Subject: Re: [LTP] ext4/e4defrag.c testcases compilation error,

Hi Garret/Miao,

On PPC systems, fallocate() seems to be already defined at /usr/include/bits/fcntl.h, so building EXT4 test cases on PPC64 machines will create build problems even if the pre-requisite packages:

e2fsprogs*
e2fsprogs-libs*
e2fsprogs-devel*

are present. So, this patch adds an extra check. Please let me know your thoughts.

Errors bound to occur:
[
gcc -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall -I/root/subrata/ltp/ltp-dev/testcases/kernel/include -I../../../../../include -I../../../../../include -L../../../../../lib e4defrag.c -lltp -lm -o e4defrag
e4defrag.c:388: error: conflicting types for ‘fallocate’ /usr/include/bits/fcntl.h:240: note: previous declaration of ‘fallocate’ was here make[1]: *** [e4defrag] Error 1
]

Signed-off-by Subrata Modak <[email protected]>

---

testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c 2010-03-24 18:09:14.336793513 +0530 renamed from testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c 2010-03-15 19:32:12.000000000 +0530 +2 -0

@@ -383,10 +383,13 @@ int sync_file_range(int fd, loff_t offse
 * @offset:            file offset.
 * @len:               file size.
 */
+
+#ifndef __NR_fallocate
 int fallocate(int fd, int mode, loff_t offset, loff_t len)
 {
       return syscall(__NR_fallocate, fd, mode, offset, len);

Quoted 8 lines

testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c 2010-03-24 18:09:14.336793513 +0530 int sync_file_range(int fd, loff_t offse · line 392

Quoted 2 lines

testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c 2010-03-24 18:09:14.336793513 +0530 renamed from testcases/kernel/fs/ext4-new-features/ext4-online-defrag/e4defrag.c 2010-03-15 19:32:12.000000000 +0530 +1 -0

 }
+#endif

If it's not defined, you're definitely in trouble because that
will result in a compile error. An autoconf test should be added for this syscall, and/or linux_syscall_numbers.h should be integrated into this test. That may be a bit heavy handed because that will integrate some libltp pieces into the tests, but that's up to Miao to decide.

Did you get a chance to check this patch ?

Regards--
Subrata

Quoted 2 lines

Thanks,
-Garrett