Land b1_8_gate onto b1_8 (20081218_1708)

[fs/lustre-release.git] / lustre / utils / ll_recover_lost_found_objs.c

diff --git a/lustre/utils/ll_recover_lost_found_objs.c b/lustre/utils/ll_recover_lost_found_objs.c
index 71b5bd2..449cfae 100644 (file)
--- a/lustre/utils/ll_recover_lost_found_objs.c
+++ b/lustre/utils/ll_recover_lost_found_objs.c
@@ -1,32 +1,51 @@
-/*
- *   Copyright (C) 2008 Sun Microssystems, Inc.
- *   Author: Rupesh Thakare <rupesh.thakare@sun.com>
- *   Author: Kalpak Shah <kalpak.shah@sun.com>
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * 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 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 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).
  *
- *   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.
+ * 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
  *
- *   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.
+ * 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/ll_recover_lost_found_objs.c
+ *
  * Tool for recovering objects from lost+found that might result from a
  * Lustre OST with a corrupted directory. Running e2fsck will fix the
  * directory, but puts all of the objects into lost+found, where they are
  * inaccessible to Lustre.
+ *
+ * Author: Kalpak Shah <kalpak.shah@sun.com>
  */
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -304,7 +323,7 @@ int check_last_id(char *mount_path)
 
        for (group = 0; group < MAX_GROUPS; group++) {
                max_objid = 0;
-               sprintf(dirname, "%s/O/"LPU64, mount_path, group);
+               sprintf(dirname, "%s/O/%llu", mount_path, group);
 
                strcpy(lastid_path, dirname);
                strcat(lastid_path, "/LAST_ID");