liblustre:

  - switch to getdirentries64
  - minor build fix

diff --git a/lustre/liblustre/tests/Makefile.am b/lustre/liblustre/tests/Makefile.am
index 593358f..3ad6264 100644 (file)
--- a/lustre/liblustre/tests/Makefile.am
+++ b/lustre/liblustre/tests/Makefile.am
@@ -23,7 +23,7 @@ echo_test_DEPENDENCIES=$(top_srcdir)/liblustre/liblsupport.a
 
 sanity_SOURCES = sanity.c
 sanity_LDADD := ./libtestcommon.a $(LLIB_EXEC)
-sanity_DEPENDENCIES = $(top_srcdir)/liblustre/liblustre.a
+sanity_DEPENDENCIES = $(top_srcdir)/liblustre/liblustre.a ./libtestcommon.a
 
 recovery_small_SOURCES = recovery_small.c
 recovery_small_LDADD := ./libtestcommon.a $(LLIB_EXEC) 

diff --git a/lustre/liblustre/tests/test_common.c b/lustre/liblustre/tests/test_common.c
index c5c6e45..6a52389 100644 (file)
--- a/lustre/liblustre/tests/test_common.c
+++ b/lustre/liblustre/tests/test_common.c
@@ -282,15 +282,15 @@ void t_grep_v(const char *path, char *str)
 
 void t_ls(int fd, char *buf, int size)
 {
-       struct dirent *ent;
+       struct dirent64 *ent;
        int rc, pos;
-       off_t base = 0;
+       loff_t base = 0;
 
        printf("dir entries listing...\n");
-       while ((rc = getdirentries(fd, buf, size, &base)) > 0) {
+       while ((rc = getdirentries64(fd, buf, size, &base)) > 0) {
                pos = 0;
                while (pos < rc) {
-                       ent = (struct dirent *) ((char*) buf + pos);
+                       ent = (struct dirent64 *) ((char*) buf + pos);
                        printf("%s\n", ent->d_name);
                        pos += ent->d_reclen;
                }