From owner-svn-src-head@freebsd.org Tue Oct 24 19:14:34 2017 Return-Path: Delivered-To: svn-src-head@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 71359E56441; Tue, 24 Oct 2017 19:14:34 +0000 (UTC) (envelope-from fsu@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 3E9356D07B; Tue, 24 Oct 2017 19:14:34 +0000 (UTC) (envelope-from fsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9OJEXcp013932; Tue, 24 Oct 2017 19:14:33 GMT (envelope-from fsu@FreeBSD.org) Received: (from fsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9OJEXYV013931; Tue, 24 Oct 2017 19:14:33 GMT (envelope-from fsu@FreeBSD.org) Message-Id: <201710241914.v9OJEXYV013931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fsu set sender to fsu@FreeBSD.org using -f From: Fedor Uporov Date: Tue, 24 Oct 2017 19:14:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324961 - head/sys/fs/ext2fs X-SVN-Group: head X-SVN-Commit-Author: fsu X-SVN-Commit-Paths: head/sys/fs/ext2fs X-SVN-Commit-Revision: 324961 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Oct 2017 19:14:34 -0000 Author: fsu Date: Tue Oct 24 19:14:33 2017 New Revision: 324961 URL: https://svnweb.freebsd.org/changeset/base/324961 Log: Do not free bufs in case of extents metadata blocks + remove unneeded asserts. Approved by: pfg (mentor) MFC after: 6 months Modified: head/sys/fs/ext2fs/ext2_extents.c Modified: head/sys/fs/ext2fs/ext2_extents.c ============================================================================== --- head/sys/fs/ext2fs/ext2_extents.c Tue Oct 24 17:14:53 2017 (r324960) +++ head/sys/fs/ext2fs/ext2_extents.c Tue Oct 24 19:14:33 2017 (r324961) @@ -420,7 +420,7 @@ ext4_ext_find_extent(struct inode *ip, daddr_t block, } ext4_ext_fill_path_bdata(&path[ppos], bp, blk); - brelse(bp); + bqrelse(bp); eh = ext4_ext_block_header(path[ppos].ep_data); error = ext4_ext_check_header(ip, eh); @@ -1228,7 +1228,7 @@ ext4_ext_get_blocks(struct inode *ip, e4fs_daddr_t ibl } if ((ex = path[depth].ep_ext)) { - uint64_t lblk = ex->e_blk; + uint64_t lblk = ex->e_blk; uint16_t e_len = ex->e_len; e4fs_daddr_t e_start = ext4_ext_extent_pblock(ex); @@ -1397,9 +1397,6 @@ ext4_ext_rm_leaf(struct inode *ip, struct ext4_extent_ /* Remove whole extent. */ block = ex_blk; num = 0; - KASSERT(a == ex_blk, ("ext4_ext_rm_leaf: bad a")); - KASSERT(b != ex_blk + ex_len - 1, - ("ext4_ext_rm_leaf: bad b")); } if (ex == EXT_FIRST_EXTENT(eh)) @@ -1508,7 +1505,7 @@ ext4_ext_remove_space(struct inode *ip, off_t length, return (error); path = malloc(sizeof(struct ext4_extent_path) * (depth + 1), - M_EXT2EXTENTS, M_WAITOK | M_ZERO); + M_EXT2EXTENTS, M_WAITOK | M_ZERO); if (!path) return (ENOMEM);