- don't make noise if we found needed capa

[fs/lustre-release.git] / lustre / liblustre / dir.c

diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c
index 0200da9..f685beb 100644 (file)
--- a/lustre/liblustre/dir.c
+++ b/lustre/liblustre/dir.c
@@ -33,16 +33,31 @@
 #include <sys/fcntl.h>
 #include <sys/queue.h>
 
+#ifdef HAVE_XTIO_H
+#include <xtio.h>
+#endif
 #include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>
+#ifdef HAVE_FILE_H
 #include <file.h>
+#endif
 
 #undef LIST_HEAD
 
+#ifdef HAVE_LINUX_TYPES_H
 #include <linux/types.h>
+#elif defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_LINUX_UNISTD_H
 #include <linux/unistd.h>
+#elif defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+
 #include <dirent.h>
 
 #include "llite_lib.h"
@@ -74,7 +89,7 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page)
                                  &data, &lockh, NULL, 0,
                                  ldlm_completion_ast, llu_mdc_blocking_ast,
                                  inode);
-                request = (struct ptlrpc_request *)it.d.lustre.it_data;
+                request = (struct ptlrpc_request *)LUSTRE_IT(&it)->it_data;
                 if (request)
                         ptlrpc_req_finished(request);
                 if (rc < 0) {