X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Flr_reader.c;h=a6d94c164292c01e64dccce942bc7f3b662b8032;hb=2f8d7b4679de3fa467040aa61733f262714e39c9;hp=f0c64dc2546fd6d1dab3b11649124ea8c4747366;hpb=e8965be4e135b55f0a900446e4a1c74905eaccd1;p=fs%2Flustre-release.git

diff --git a/lustre/utils/lr_reader.c b/lustre/utils/lr_reader.c
index f0c64dc..a6d94c1 100644
--- a/lustre/utils/lr_reader.c
+++ b/lustre/utils/lr_reader.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * 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.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -63,16 +59,16 @@
 #include <string.h>
 #include <getopt.h>
 
-#include <lustre_disk.h>
-#include <lustre_ver.h>
+#include <asm/byteorder.h>
+#include <linux/lustre/lustre_disk.h>
+#include <linux/lustre/lustre_ver.h>
 
 char *progname;
-static struct option const longopts[] = {
-	{ "help", no_argument, 0, 'h' },
-	{ "client", no_argument, 0, 'c' },
-	{ "reply", no_argument, 0, 'r' },
-	{ 0, 0, 0, 0}
-};
+static struct option const long_opts[] = {
+	{ .val = 'c',	.name = "client",	.has_arg = no_argument },
+	{ .val = 'h',	.name = "help",		.has_arg = no_argument },
+	{ .val = 'r',	.name = "reply",	.has_arg = no_argument },
+	{ .name = NULL } };
 
 /* Executes the command \a cmd and returns command status.
  */
@@ -140,7 +136,7 @@ int main(int argc, char *const argv[])
 	int opt_reply = 0;
 
 	progname = argv[0];
-	while ((c = getopt_long(argc, argv, "chr", longopts, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "chr", long_opts, NULL)) != -1) {
 		switch (c) {
 		case 'c':
 			opt_client = 1;