From: zab <zab>
Date: Fri, 27 Feb 2004 21:32:37 +0000 (+0000)
Subject: - update b_cray_portals_merge from head
X-Git-Tag: v1_7_100~1^103~11
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=6294c9811888682b8d2919c7cf340ee17ac843b1;p=fs%2Flustre-release.git

- update b_cray_portals_merge from head
  (HEAD_CRAY_PORTALS_MERGE_UPDATE_CHILD_20040227_1243)
  in preparation for 2776 work
  (the bug where our future-forefathers sing and dance)
---

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index a41f7a7..4685e46 100644
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -34,12 +34,11 @@
 
 #include <liblustre.h>
 #include <linux/lustre_idl.h>
+#include <linux/lustre_user.h>
 
 #include "parser.h"
 #include "obdctl.h"
 
-extern int op_create_file(char *name, long stripe_size, int stripe_offset,
-                int stripe_count);
 extern int op_find(char *path, struct obd_uuid *obduuid, int recursive,
                 int verbose, int quiet);
 extern int op_check(int type_num, char **obd_type_p, char *dir);