From owner-svn-src-stable-7@freebsd.org  Wed Oct  7 09:41:18 2015
Return-Path: <owner-svn-src-stable-7@freebsd.org>
Delivered-To: svn-src-stable-7@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 CD4109B93F7;
 Wed,  7 Oct 2015 09:41:18 +0000 (UTC)
 (envelope-from avatar@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 9471BF0C;
 Wed,  7 Oct 2015 09:41:18 +0000 (UTC)
 (envelope-from avatar@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t979fHTc061977;
 Wed, 7 Oct 2015 09:41:17 GMT (envelope-from avatar@FreeBSD.org)
Received: (from avatar@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t979fH5Q061976;
 Wed, 7 Oct 2015 09:41:17 GMT (envelope-from avatar@FreeBSD.org)
Message-Id: <201510070941.t979fH5Q061976@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: Wed, 7 Oct 2015 09:41:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r288988 - stable/7/sys/gnu/fs/reiserfs
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
 <svn-src-stable-7.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-7>, 
 <mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7/>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
 <mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2015 09:41:18 -0000

Author: avatar
Date: Wed Oct  7 09:41:17 2015
New Revision: 288988
URL: https://svnweb.freebsd.org/changeset/base/288988

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

Modified:
  stable/7/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
==============================================================================
--- stable/7/sys/gnu/fs/reiserfs/reiserfs_vfsops.c	Wed Oct  7 09:39:45 2015	(r288987)
+++ stable/7/sys/gnu/fs/reiserfs/reiserfs_vfsops.c	Wed Oct  7 09:41:17 2015	(r288988)
@@ -985,8 +985,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--;