LU-10189 osd: handle PFID EA in LMA properly

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_iam_lvar.c

diff --git a/lustre/osd-ldiskfs/osd_iam_lvar.c b/lustre/osd-ldiskfs/osd_iam_lvar.c
index a519c89..89aeac5 100644 (file)
--- a/lustre/osd-ldiskfs/osd_iam_lvar.c
+++ b/lustre/osd-ldiskfs/osd_iam_lvar.c
@@ -14,12 +14,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * 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.
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -729,7 +725,6 @@ static void lvar_split(struct iam_leaf *leaf, struct buffer_head **bh,
                  * insertion point moves into new leaf.
                  */
                 ptrdiff_t shift;
-                int result;
 
                 shift = PDIFF(leaf->il_at, first_to_move);
                 *bh = leaf->il_bh;
@@ -737,7 +732,7 @@ static void lvar_split(struct iam_leaf *leaf, struct buffer_head **bh,
                 leaf->il_curidx = new_blknr;
 
                 assert_corr(iam_leaf_is_locked(leaf));
-                result = lvar_init(leaf);
+                lvar_init(leaf);
                 /*
                  * init cannot fail, as node was just initialized.
                  */