LU-2683 lov: release all locks in closure to release sublock

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

diff --git a/lustre/osd-ldiskfs/osd_iam_lfix.c b/lustre/osd-ldiskfs/osd_iam_lfix.c
index b36683f..aef90aa 100644 (file)
--- a/lustre/osd-ldiskfs/osd_iam_lfix.c
+++ b/lustre/osd-ldiskfs/osd_iam_lfix.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012 Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -331,8 +331,7 @@ static int iam_lfix_lookup(struct iam_leaf *l, const struct iam_key *k)
 
 static int iam_lfix_ilookup(struct iam_leaf *l, const struct iam_ikey *ik)
 {
-        assert(0);
-        return IAM_LOOKUP_OK;
+       return iam_lfix_lookup(l, (const struct iam_key *)ik);
 }
 
 static void iam_lfix_key_set(struct iam_leaf *l, const struct iam_key *k)
@@ -484,7 +483,7 @@ static void iam_lfix_split(struct iam_leaf *l, struct buffer_head **bh,
         pivot = (const struct iam_ikey *)iam_leaf_key_at(start);
 
         memmove(iam_entries(new_leaf), start, finis - start);
-        hdr->ill_count = count - split;
+       hdr->ill_count = cpu_to_le16(count - split);
         lentry_count_set(l, split);
         if ((void *)l->il_at >= start) {
                 /*