X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Fl_ioctl.c;h=0671c241a31648b45a3ba0a4aea2dca0e5d476ac;hb=a5056c1d275d463335e06404b5a920afd682c382;hp=58a408a8f1309cf90474a7839bc8bf175501dd73;hpb=e0576be940d7af30b2ba6e219891a4413670325d;p=fs%2Flustre-release.git

diff --git a/lnet/utils/l_ioctl.c b/lnet/utils/l_ioctl.c
index 58a408a..0671c24 100644
--- a/lnet/utils/l_ioctl.c
+++ b/lnet/utils/l_ioctl.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define __USE_FILE_OFFSET64
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -54,7 +56,7 @@ static struct ioc_dev ioc_dev_list[10];
 struct dump_hdr {
 	int magic;
 	int dev_id;
-	int opc;
+        unsigned int opc;
 };
 
 char *dump_filename;
@@ -99,7 +101,7 @@ open_ioc_dev(int dev_id)
 
 
 static int 
-do_ioctl(int dev_id, int opc, void *buf)
+do_ioctl(int dev_id, unsigned int opc, void *buf)
 {
 	int fd, rc;
 	
@@ -129,7 +131,7 @@ get_dump_file()
  * used, but for now it will assumed whatever app reads the file will
  * know what to do. */
 int 
-dump(int dev_id, int opc, void *buf)
+dump(int dev_id, unsigned int opc, void *buf)
 {
 	FILE *fp;
 	struct dump_hdr dump_hdr;
@@ -210,7 +212,7 @@ set_ioctl_dump(char * file)
 }
 
 int
-l_ioctl(int dev_id, int opc, void *buf)
+l_ioctl(int dev_id, unsigned int opc, void *buf)
 {
         return current_ioc_handler(dev_id, opc, buf);
 }
@@ -224,7 +226,7 @@ l_ioctl(int dev_id, int opc, void *buf)
  * each device used in the dump.
  */
 int 
-parse_dump(char * dump_file, int (*ioc_func)(int dev_id, int opc, void *))
+parse_dump(char * dump_file, ioc_handler_t ioc_func)
 {
 	int line =0;
 	struct stat st;
@@ -244,12 +246,7 @@ parse_dump(char * dump_file, int (*ioc_func)(int dev_id, int opc, void *))
                 exit(1);
         }
 
-#ifndef SYS_fstat64
-# define __SYS_fstat__ SYS_fstat
-#else
-# define __SYS_fstat__ SYS_fstat64
-#endif
-	if (syscall(__SYS_fstat__, fd, &st)) { 
+	if (fstat(fd, &st)) { 
 		perror("stat fails");
 		exit(1);
 	}