From owner-svn-src-all@freebsd.org Fri Sep 6 08:08:35 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F01F2ECA96; Fri, 6 Sep 2019 08:08:35 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Pqv74x3Kz42JS; Fri, 6 Sep 2019 08:08:35 +0000 (UTC) (envelope-from cem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8CA5419C7A; Fri, 6 Sep 2019 08:08:35 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8688ZYb051007; Fri, 6 Sep 2019 08:08:35 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8688YdR051001; Fri, 6 Sep 2019 08:08:34 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201909060808.x8688YdR051001@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Fri, 6 Sep 2019 08:08:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351929 - head/sys/ufs/ffs X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/sys/ufs/ffs X-SVN-Commit-Revision: 351929 X-SVN-Commit-Repository: base 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.29 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: Fri, 06 Sep 2019 08:08:36 -0000 Author: cem Date: Fri Sep 6 08:08:33 2019 New Revision: 351929 URL: https://svnweb.freebsd.org/changeset/base/351929 Log: ufs: Remove redundant brelse() after r294954 Same automation. No functional change. Modified: head/sys/ufs/ffs/ffs_alloc.c head/sys/ufs/ffs/ffs_balloc.c head/sys/ufs/ffs/ffs_snapshot.c head/sys/ufs/ffs/ffs_softdep.c head/sys/ufs/ffs/ffs_subr.c head/sys/ufs/ffs/ffs_vfsops.c Modified: head/sys/ufs/ffs/ffs_alloc.c ============================================================================== --- head/sys/ufs/ffs/ffs_alloc.c Fri Sep 6 08:08:10 2019 (r351928) +++ head/sys/ufs/ffs/ffs_alloc.c Fri Sep 6 08:08:33 2019 (r351929) @@ -300,7 +300,6 @@ retry: */ error = bread_gb(vp, lbprev, osize, NOCRED, gbflags, &bp); if (error) { - brelse(bp); return (error); } Modified: head/sys/ufs/ffs/ffs_balloc.c ============================================================================== --- head/sys/ufs/ffs/ffs_balloc.c Fri Sep 6 08:08:10 2019 (r351928) +++ head/sys/ufs/ffs/ffs_balloc.c Fri Sep 6 08:08:33 2019 (r351929) @@ -173,7 +173,6 @@ ffs_balloc_ufs1(struct vnode *vp, off_t startoffset, i if (nb != 0 && ip->i_size >= smalllblktosize(fs, lbn + 1)) { error = bread(vp, lbn, fs->fs_bsize, NOCRED, &bp); if (error) { - brelse(bp); return (error); } bp->b_blkno = fsbtodb(fs, nb); @@ -189,7 +188,6 @@ ffs_balloc_ufs1(struct vnode *vp, off_t startoffset, i if (nsize <= osize) { error = bread(vp, lbn, osize, NOCRED, &bp); if (error) { - brelse(bp); return (error); } bp->b_blkno = fsbtodb(fs, nb); @@ -292,7 +290,6 @@ retry: error = bread(vp, indirs[i].in_lbn, (int)fs->fs_bsize, NOCRED, &bp); if (error) { - brelse(bp); goto fail; } bap = (ufs1_daddr_t *)bp->b_data; @@ -665,7 +662,6 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i error = bread_gb(vp, -1 - lbn, fs->fs_bsize, NOCRED, gbflags, &bp); if (error) { - brelse(bp); return (error); } bp->b_blkno = fsbtodb(fs, nb); @@ -683,7 +679,6 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i error = bread_gb(vp, -1 - lbn, osize, NOCRED, gbflags, &bp); if (error) { - brelse(bp); return (error); } bp->b_blkno = fsbtodb(fs, nb); @@ -771,7 +766,6 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i error = bread_gb(vp, lbn, fs->fs_bsize, NOCRED, gbflags, &bp); if (error) { - brelse(bp); return (error); } bp->b_blkno = fsbtodb(fs, nb); @@ -788,7 +782,6 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i error = bread_gb(vp, lbn, osize, NOCRED, gbflags, &bp); if (error) { - brelse(bp); return (error); } bp->b_blkno = fsbtodb(fs, nb); @@ -892,7 +885,6 @@ retry: error = bread(vp, indirs[i].in_lbn, (int)fs->fs_bsize, NOCRED, &bp); if (error) { - brelse(bp); goto fail; } bap = (ufs2_daddr_t *)bp->b_data; Modified: head/sys/ufs/ffs/ffs_snapshot.c ============================================================================== --- head/sys/ufs/ffs/ffs_snapshot.c Fri Sep 6 08:08:10 2019 (r351928) +++ head/sys/ufs/ffs/ffs_snapshot.c Fri Sep 6 08:08:33 2019 (r351929) @@ -789,7 +789,6 @@ out1: for (loc = 0; loc < len; loc++) { error = bread(vp, blkno + loc, fs->fs_bsize, KERNCRED, &nbp); if (error) { - brelse(nbp); fs->fs_snapinum[snaploc] = 0; free(snapblklist, M_UFSMNT); goto done; Modified: head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- head/sys/ufs/ffs/ffs_softdep.c Fri Sep 6 08:08:10 2019 (r351928) +++ head/sys/ufs/ffs/ffs_softdep.c Fri Sep 6 08:08:33 2019 (r351929) @@ -6698,7 +6698,6 @@ softdep_journal_freeblocks(ip, cred, length, flags) error = bread(ump->um_devvp, fsbtodb(fs, ino_to_fsba(fs, ip->i_number)), (int)fs->fs_bsize, cred, &bp); if (error) { - brelse(bp); softdep_error("softdep_journal_freeblocks", error); return; } Modified: head/sys/ufs/ffs/ffs_subr.c ============================================================================== --- head/sys/ufs/ffs/ffs_subr.c Fri Sep 6 08:08:10 2019 (r351928) +++ head/sys/ufs/ffs/ffs_subr.c Fri Sep 6 08:08:33 2019 (r351929) @@ -102,7 +102,6 @@ ffs_blkatoff(struct vnode *vp, off_t offset, char **re *bpp = NULL; error = bread(vp, lbn, bsize, NOCRED, &bp); if (error) { - brelse(bp); return (error); } if (res) Modified: head/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vfsops.c Fri Sep 6 08:08:10 2019 (r351928) +++ head/sys/ufs/ffs/ffs_vfsops.c Fri Sep 6 08:08:33 2019 (r351929) @@ -1767,7 +1767,6 @@ ffs_vgetf(mp, ino, flags, vpp, ffs_flags) * still zero, it will be unlinked and returned to the free * list by vput(). */ - brelse(bp); vput(vp); *vpp = NULL; return (error);