From owner-svn-src-all@freebsd.org  Sat Aug 29 11:15:55 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 431FA9C5A06;
 Sat, 29 Aug 2015 11:15:55 +0000 (UTC)
 (envelope-from avatar@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3381C115B;
 Sat, 29 Aug 2015 11:15:55 +0000 (UTC)
 (envelope-from avatar@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7TBFtJ3058745;
 Sat, 29 Aug 2015 11:15:55 GMT (envelope-from avatar@FreeBSD.org)
Received: (from avatar@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7TBFt4J058744;
 Sat, 29 Aug 2015 11:15:55 GMT (envelope-from avatar@FreeBSD.org)
Message-Id: <201508291115.t7TBFt4J058744@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avatar set sender to
 avatar@FreeBSD.org using -f
From: Tai-hwa Liang <avatar@FreeBSD.org>
Date: Sat, 29 Aug 2015 11:15:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r287287 - stable/10/sys/gnu/fs/reiserfs
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Aug 2015 11:15:55 -0000

Author: avatar
Date: Sat Aug 29 11:15:54 2015
New Revision: 287287
URL: https://svnweb.freebsd.org/changeset/base/287287

Log:
  MFC r286888: Using consistent coding style to deal with error inside the loop.

Modified:
  stable/10/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
==============================================================================
--- stable/10/sys/gnu/fs/reiserfs/reiserfs_vfsops.c	Sat Aug 29 10:53:53 2015	(r287286)
+++ stable/10/sys/gnu/fs/reiserfs/reiserfs_vfsops.c	Sat Aug 29 11:15:54 2015	(r287287)
@@ -960,8 +960,8 @@ uint32_t find_hash_out(struct reiserfs_m
 		    key.on_disk_key.k_objectid, key.on_disk_key.k_dir_id);
 		retval = search_by_entry_key(sbi, &key, &path, &de);
 		if (retval == IO_ERROR) {
-			pathrelse(&path);
-			return (UNSET_HASH);
+			hash = UNSET_HASH;
+			break;
 		}
 		if (retval == NAME_NOT_FOUND)
 			de.de_entry_num--;