Land b1_2 onto HEAD (20040304_171022)

[fs/lustre-release.git] / lustre / portals / utils / debug.c

diff --git a/lustre/portals/utils/debug.c b/lustre/portals/utils/debug.c
index 3f3e69c..01e690f 100644 (file)
--- a/lustre/portals/utils/debug.c
+++ b/lustre/portals/utils/debug.c
@@ -23,6 +23,8 @@
  *
  */
 
+#define __USE_FILE_OFFSET64
+
 #include <stdio.h>
 #include <netdb.h>
 #include <stdlib.h>
@@ -64,12 +66,13 @@ static int debug_mask = ~0;
 static const char *portal_debug_subsystems[] =
         {"undefined", "mdc", "mds", "osc", "ost", "class", "log", "llite",
          "rpc", "mgmt", "portals", "socknal", "qswnal", "pinger", "filter",
-         "ptlbd", "echo", "ldlm", "lov", "gmnal", "router", "cobd", NULL};
+         "ptlbd", "echo", "ldlm", "lov", "gmnal", "router", "cobd", "ibnal",
+         NULL};
 static const char *portal_debug_masks[] =
         {"trace", "inode", "super", "ext2", "malloc", "cache", "info", "ioctl",
          "blocks", "net", "warning", "buffs", "other", "dentry", "portals",
          "page", "dlmtrace", "error", "emerg", "ha", "rpctrace", "vfstrace",
-         NULL};
+         "reada", NULL};
 
 struct debug_daemon_cmd {
         char *cmd;
@@ -416,16 +419,7 @@ int jt_dbg_debug_file(int argc, char **argv)
                 return -1;
         }
 
-#ifndef __CYGWIN__
-# ifndef SYS_fstat64
-#  define __SYS_fstat__ SYS_fstat
-# else
-#  define __SYS_fstat__ SYS_fstat64
-# endif
-        rc = syscall(__SYS_fstat__, fd, &statbuf);
-#else
         rc = fstat(fd, &statbuf);
-#endif
         if (rc < 0) {
                 fprintf(stderr, "fstat failed: %s\n", strerror(errno));
                 goto out;