From owner-svn-src-projects@freebsd.org Tue Apr 23 22:25:51 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 883C21584610 for ; Tue, 23 Apr 2019 22:25:51 +0000 (UTC) (envelope-from asomers@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 2C25C8DDC9; Tue, 23 Apr 2019 22:25:51 +0000 (UTC) (envelope-from asomers@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 0067F2F75; Tue, 23 Apr 2019 22:25:51 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3NMPoqq066014; Tue, 23 Apr 2019 22:25:50 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3NMPoTK066013; Tue, 23 Apr 2019 22:25:50 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201904232225.x3NMPoTK066013@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 23 Apr 2019 22:25:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r346607 - projects/fuse2/sys/fs/fuse X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/sys/fs/fuse X-SVN-Commit-Revision: 346607 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2C25C8DDC9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Apr 2019 22:25:51 -0000 Author: asomers Date: Tue Apr 23 22:25:50 2019 New Revision: 346607 URL: https://svnweb.freebsd.org/changeset/base/346607 Log: fusefs: use vfs_bio_clrbuf in fuse_vnode_setsize Reuse fuse_vnode_setsize instead of reinventing the wheel. This is what ext2_ind_truncate does. PR: 233783 Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/sys/fs/fuse/fuse_node.c Modified: projects/fuse2/sys/fs/fuse/fuse_node.c ============================================================================== --- projects/fuse2/sys/fs/fuse/fuse_node.c Tue Apr 23 22:22:46 2019 (r346606) +++ projects/fuse2/sys/fs/fuse/fuse_node.c Tue Apr 23 22:25:50 2019 (r346607) @@ -434,7 +434,6 @@ fuse_vnode_setsize(struct vnode *vp, struct ucred *cre if (newsize < oldsize) { daddr_t lbn; - size_t zsize; err = vtruncbuf(vp, cred, newsize, fuse_iosize(vp)); if (err) @@ -454,8 +453,8 @@ fuse_vnode_setsize(struct vnode *vp, struct ucred *cre } if (!(bp->b_flags & B_CACHE)) goto out; /* Nothing to do */ - zsize = (lbn + 1) * iosize - newsize; - bzero(bp->b_data + newsize - lbn * iosize, zsize); + MPASS(bp->b_flags & B_VMIO); + vfs_bio_clrbuf(bp); } out: if (bp)