X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Floadgen.c;h=e49c887d935d436f867ef0e4ea1456b905a053f7;hb=adde80ff;hp=d691e3697f01b8eb1c9f8a1e467f0182044a375c;hpb=ce6c22e8f3393d4c5df04f45bfac5d397d54cf41;p=fs%2Flustre-release.git

diff --git a/lustre/utils/loadgen.c b/lustre/utils/loadgen.c
index d691e36..e49c887 100644
--- a/lustre/utils/loadgen.c
+++ b/lustre/utils/loadgen.c
@@ -1,30 +1,46 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *   Copyright (C) 2006 Cluster File Systems, Inc.
- *   Author: Nathan Rutman <nathan@clusterfs.com>
+ * GPL HEADER START
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see [sun.com URL with a
+ * copy of GPLv2].
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/utils/loadgen.c
  *
- * loadgen.c
  * See how many local OSCs we can start whaling on a OST
  * We're doing direct ioctls instead of going though a system() call to lctl
  * to avoid the bash overhead.
  * Adds an osc / echo client pair in each thread and starts echo transactions.
  *
+ * Author: Nathan Rutman <nathan@clusterfs.com>
  */
 
 #include <pthread.h>
@@ -42,7 +58,7 @@
 #include <sys/time.h>
 
 #include <lnet/lnetctl.h>
-#include "parser.h"
+#include <libcfs/libcfsutil.h>
 #include "obdctl.h"
 
 static char cmdname[512];
@@ -248,7 +264,7 @@ static int write_proc(char *proc_path, char *value)
         return rc;
 }
 
-static int read_proc(char *proc_path, long long *value)
+static int read_proc(char *proc_path,  unsigned long long *value)
 {
         int fd, rc;
         char buf[50];
@@ -461,6 +477,7 @@ static int obj_create(struct kid_t *kid)
         data.ioc_dev = kid->k_dev;
         data.ioc_obdo1.o_mode = 0100644;
         data.ioc_obdo1.o_id = 0;
+        data.ioc_obdo1.o_gr = 2;
         data.ioc_obdo1.o_uid = 0;
         data.ioc_obdo1.o_gid = 0;
         data.ioc_obdo1.o_valid = OBD_MD_FLTYPE | OBD_MD_FLMODE |
@@ -1034,4 +1051,3 @@ int main (int argc, char **argv)
         return rc;
 }
 #endif
-