From owner-svn-src-all@freebsd.org Tue Jun 7 18:23:23 2016 Return-Path: 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 98504B6E27A; Tue, 7 Jun 2016 18:23:23 +0000 (UTC) (envelope-from pfg@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 4D48A16FC; Tue, 7 Jun 2016 18:23:23 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u57INMNb094062; Tue, 7 Jun 2016 18:23:22 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u57INMkX094061; Tue, 7 Jun 2016 18:23:22 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201606071823.u57INMkX094061@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 7 Jun 2016 18:23:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301560 - head/sys/fs/ext2fs X-SVN-Group: head 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.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jun 2016 18:23:23 -0000 Author: pfg Date: Tue Jun 7 18:23:22 2016 New Revision: 301560 URL: https://svnweb.freebsd.org/changeset/base/301560 Log: ext2fs: rearrange ext4_bmapext(). While here assign error a bit later. Reviewed by: Damjan Jovanovich Obtained from: NetBSD Modified: head/sys/fs/ext2fs/ext2_bmap.c Modified: head/sys/fs/ext2fs/ext2_bmap.c ============================================================================== --- head/sys/fs/ext2fs/ext2_bmap.c Tue Jun 7 17:08:34 2016 (r301559) +++ head/sys/fs/ext2fs/ext2_bmap.c Tue Jun 7 18:23:22 2016 (r301560) @@ -97,7 +97,7 @@ ext4_bmapext(struct vnode *vp, int32_t b struct ext4_extent *ep; struct ext4_extent_path path = { .ep_bp = NULL }; daddr_t lbn; - int error = 0; + int error; ip = VTOI(vp); fs = ip->i_e2fs; @@ -105,9 +105,9 @@ ext4_bmapext(struct vnode *vp, int32_t b if (runp != NULL) *runp = 0; - if (runb != NULL) *runb = 0; + error = 0; ext4_ext_find_extent(fs, ip, lbn, &path); if (path.ep_is_sparse) { @@ -118,27 +118,26 @@ ext4_bmapext(struct vnode *vp, int32_t b if (runb != NULL) *runb = lbn - path.ep_sparse_ext.e_blk; } else { - ep = path.ep_ext; - if (ep == NULL) + if ( path.ep_ext == NULL) { error = EIO; - else { - *bnp = fsbtodb(fs, lbn - ep->e_blk + - (ep->e_start_lo | (daddr_t)ep->e_start_hi << 32)); - - if (*bnp == 0) - *bnp = -1; - - if (runp != NULL) - *runp = ep->e_len - (lbn - ep->e_blk) - 1; - if (runb != NULL) - *runb = lbn - ep->e_blk; + goto out; } + ep = path.ep_ext; + *bnp = fsbtodb(fs, lbn - ep->e_blk + + (ep->e_start_lo | (daddr_t)ep->e_start_hi << 32)); + + if (*bnp == 0) + *bnp = -1; + + if (runp != NULL) + *runp = ep->e_len - (lbn - ep->e_blk) - 1; + if (runb != NULL) + *runb = lbn - ep->e_blk; } - if (path.ep_bp != NULL) { +out: + if (path.ep_bp != NULL) brelse(path.ep_bp); - path.ep_bp = NULL; - } return (error); }