X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_iam_lfix.c;h=17fdc497f164658c3ec7354039e2d4ca573636d9;hp=db100f231f6bdd59bfddee0b92091af767d8d9ee;hb=5a6aa0e6d1583cc0d4c82ae8c95fb7b9856d6284;hpb=34bdd30ec6a2010dfd98c5110487df210d03815d

diff --git a/lustre/osd-ldiskfs/osd_iam_lfix.c b/lustre/osd-ldiskfs/osd_iam_lfix.c
index db100f2..17fdc49 100644
--- a/lustre/osd-ldiskfs/osd_iam_lfix.c
+++ b/lustre/osd-ldiskfs/osd_iam_lfix.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, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -489,13 +485,12 @@ static void iam_lfix_split(struct iam_leaf *l, struct buffer_head **bh,
                  * insertion point moves into new leaf.
                  */
                 int shift;
-                int result;
 
                 shift = iam_lfix_diff(l, l->il_at, start);
                 *bh = l->il_bh;
                 l->il_bh = new_leaf;
                 l->il_curidx = new_blknr;
-                result = iam_lfix_init(l);
+                iam_lfix_init(l);
                 /*
                  * init cannot fail, as node was just initialized.
                  */
@@ -862,20 +857,29 @@ int iam_lfix_create(struct inode *obj,
 
         sb = obj->i_sb;
         bsize = sb->s_blocksize;
-        root_node = osd_ldiskfs_append(handle, obj, &blknr, &result);
-        leaf_node = osd_ldiskfs_append(handle, obj, &blknr, &result);
-        if (root_node != NULL && leaf_node != NULL) {
-                lfix_root(root_node->b_data, bsize, keysize, ptrsize, recsize);
-                lfix_leaf(leaf_node->b_data, bsize, keysize, ptrsize, recsize);
-                ldiskfs_mark_inode_dirty(handle, obj);
-		result = ldiskfs_handle_dirty_metadata(handle, NULL, root_node);
-		if (result == 0)
-			result = ldiskfs_handle_dirty_metadata(handle, NULL,
-							       leaf_node);
-                if (result != 0)
-                        ldiskfs_std_error(sb, result);
-        }
-        brelse(leaf_node);
-        brelse(root_node);
-        return result;
+	root_node = osd_ldiskfs_append(handle, obj, &blknr);
+	if (IS_ERR(root_node))
+		GOTO(out, result = PTR_ERR(root_node));
+
+	leaf_node = osd_ldiskfs_append(handle, obj, &blknr);
+	if (IS_ERR(leaf_node))
+		GOTO(out_root, result = PTR_ERR(leaf_node));
+
+	lfix_root(root_node->b_data, bsize, keysize, ptrsize, recsize);
+	lfix_leaf(leaf_node->b_data, bsize, keysize, ptrsize, recsize);
+	ldiskfs_mark_inode_dirty(handle, obj);
+	result = ldiskfs_handle_dirty_metadata(handle, NULL, root_node);
+	if (result == 0)
+		result = ldiskfs_handle_dirty_metadata(handle, NULL, leaf_node);
+	if (result != 0)
+		ldiskfs_std_error(sb, result);
+
+	brelse(leaf_node);
+
+	GOTO(out_root, result);
+
+out_root:
+	brelse(root_node);
+out:
+	return result;
 }