From owner-svn-src-all@freebsd.org Fri Sep 6 08:08:11 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 77DC6ECA25; Fri, 6 Sep 2019 08:08:11 +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 46Pqtg2bcdz42B1; Fri, 6 Sep 2019 08:08:11 +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 3B6F519C79; Fri, 6 Sep 2019 08:08:11 +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 x8688Bb6050940; Fri, 6 Sep 2019 08:08:11 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8688A6F050934; Fri, 6 Sep 2019 08:08:10 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201909060808.x8688A6F050934@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:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351928 - head/sys/fs/msdosfs X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/sys/fs/msdosfs X-SVN-Commit-Revision: 351928 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:11 -0000 Author: cem Date: Fri Sep 6 08:08:10 2019 New Revision: 351928 URL: https://svnweb.freebsd.org/changeset/base/351928 Log: msdosfs: Remove redundant brelse() after r294954 Same automation. No functional change. Modified: head/sys/fs/msdosfs/msdosfs_fat.c head/sys/fs/msdosfs/msdosfs_lookup.c head/sys/fs/msdosfs/msdosfs_vfsops.c head/sys/fs/msdosfs/msdosfs_vnops.c Modified: head/sys/fs/msdosfs/msdosfs_fat.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_fat.c Fri Sep 6 08:07:36 2019 (r351927) +++ head/sys/fs/msdosfs/msdosfs_fat.c Fri Sep 6 08:08:10 2019 (r351928) @@ -202,7 +202,6 @@ pcbmap(struct denode *dep, u_long findcn, daddr_t *bnp brelse(bp); error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp); if (error) { - brelse(bp); return (error); } bp_bn = bn; @@ -504,7 +503,6 @@ fatentry(int function, struct msdosfsmount *pmp, u_lon fatblock(pmp, byteoffset, &bn, &bsize, &bo); error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp); if (error) { - brelse(bp); return (error); } @@ -587,7 +585,6 @@ fatchain(struct msdosfsmount *pmp, u_long start, u_lon fatblock(pmp, byteoffset, &bn, &bsize, &bo); error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp); if (error) { - brelse(bp); return (error); } while (count > 0) { @@ -843,7 +840,6 @@ freeclusterchain(struct msdosfsmount *pmp, u_long clus updatefats(pmp, bp, lbn); error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp); if (error) { - brelse(bp); MSDOSFS_UNLOCK_MP(pmp); return (error); } Modified: head/sys/fs/msdosfs/msdosfs_lookup.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_lookup.c Fri Sep 6 08:07:36 2019 (r351927) +++ head/sys/fs/msdosfs/msdosfs_lookup.c Fri Sep 6 08:08:10 2019 (r351928) @@ -234,7 +234,6 @@ msdosfs_lookup_(struct vnode *vdp, struct vnode **vpp, } error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp); if (error) { - brelse(bp); return (error); } for (blkoff = 0; blkoff < blsize; @@ -681,7 +680,6 @@ createde(struct denode *dep, struct denode *ddep, stru error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp); if (error) { - brelse(bp); return error; } ndep = bptoep(pmp, bp, ddep->de_fndoffset); @@ -747,7 +745,6 @@ dosdirempty(struct denode *dep) } error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp); if (error) { - brelse(bp); return (0); } for (dentp = (struct direntry *)bp->b_data; @@ -960,7 +957,6 @@ removede(struct denode *pdep, struct denode *dep) return error; error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp); if (error) { - brelse(bp); return error; } ep = bptoep(pmp, bp, offset); @@ -1037,7 +1033,6 @@ uniqdosname(struct denode *dep, struct componentname * } error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp); if (error) { - brelse(bp); return error; } for (dentp = (struct direntry *)bp->b_data; Modified: head/sys/fs/msdosfs/msdosfs_vfsops.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_vfsops.c Fri Sep 6 08:07:36 2019 (r351927) +++ head/sys/fs/msdosfs/msdosfs_vfsops.c Fri Sep 6 08:08:10 2019 (r351928) @@ -862,7 +862,6 @@ msdosfs_fsiflush(struct msdosfsmount *pmp, int waitfor error = bread(pmp->pm_devvp, pmp->pm_fsinfo, pmp->pm_BytesPerSec, NOCRED, &bp); if (error != 0) { - brelse(bp); goto unlock; } fp = (struct fsinfo *)bp->b_data; Modified: head/sys/fs/msdosfs/msdosfs_vnops.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_vnops.c Fri Sep 6 08:07:36 2019 (r351927) +++ head/sys/fs/msdosfs/msdosfs_vnops.c Fri Sep 6 08:08:10 2019 (r351928) @@ -758,7 +758,6 @@ msdosfs_write(struct vop_write_args *ap) */ error = bread(thisvp, bn, pmp->pm_bpcluster, cred, &bp); if (error) { - brelse(bp); break; } } @@ -1225,7 +1224,6 @@ abortit: NOCRED, &bp); if (error) { /* XXX should downgrade to ro here, fs is corrupt */ - brelse(bp); VOP_UNLOCK(fvp, 0); goto bad; } @@ -1593,7 +1591,6 @@ msdosfs_readdir(struct vop_readdir_args *ap) break; error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp); if (error) { - brelse(bp); return (error); } n = min(n, blsize - bp->b_resid);