b=19387 integrate LST into acc-sm

[fs/lustre-release.git] / lustre / osd / osd_igif.c

diff --git a/lustre/osd/osd_igif.c b/lustre/osd/osd_igif.c
index 9bf9870..9228d18 100644 (file)
--- a/lustre/osd/osd_igif.c
+++ b/lustre/osd/osd_igif.c
@@ -1,29 +1,43 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *  lustre/osd/osd_igif.c
- *  igif (compatibility fids) support
+ * GPL HEADER START
  *
- *  Copyright (c) 2006 Cluster File Systems, Inc.
- *   Author: Nikita Danilov <nikita@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of the Lustre file system, http://www.lustre.org
- *   Lustre is a trademark of Cluster File Systems, Inc.
+ * 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.
  *
- *   You may have signed or agreed to another license before downloading
- *   this software.  If so, you are bound by the terms and conditions
- *   of that agreement, and the following does not apply to you.  See the
- *   LICENSE file included with this distribution for more information.
+ * 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).
  *
- *   If you did not agree to a different license, then this copy of Lustre
- *   is open source 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.
+ * 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
  *
- *   In either case, 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
- *   license text for more details.
+ * 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/osd/osd_igif.c
+ *
+ * igif (compatibility fids) support
+ *
+ * Author: Nikita Danilov <nikita@clusterfs.com>
  */
 
 #ifndef EXPORT_SYMTAB
@@ -49,22 +63,10 @@ void lu_igif_to_id(const struct lu_fid *fid, struct osd_inode_id *id)
         id->oii_gen = lu_igif_gen(fid);
 }
 
-__u32 lu_igif_ino(const struct lu_fid *fid)
-{
-        LASSERT(fid_is_igif(fid));
-        return fid_oid(fid);
-}
-
-__u32 lu_igif_gen(const struct lu_fid *fid)
-{
-        LASSERT(fid_is_igif(fid));
-        return fid_ver(fid);
-}
-
 void lu_igif_build(struct lu_fid *fid, __u32 ino, __u32 gen)
 {
-        fid->f_seq = LUSTRE_ROOT_FID_SEQ;
-        fid->f_oid = ino;
-        fid->f_ver = gen;
+        fid->f_seq = ino;
+        fid->f_oid = gen;
+        fid->f_ver = 0;
         LASSERT(fid_is_igif(fid));
 }