From owner-svn-src-head@freebsd.org Sat Oct 5 17:44:34 2019 Return-Path: Delivered-To: svn-src-head@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 6A5FC138E5D; Sat, 5 Oct 2019 17:44:34 +0000 (UTC) (envelope-from mjg@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 46lvJL27ycz3yLy; Sat, 5 Oct 2019 17:44:34 +0000 (UTC) (envelope-from mjg@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 2C4CE186F8; Sat, 5 Oct 2019 17:44:34 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x95HiYXL074512; Sat, 5 Oct 2019 17:44:34 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x95HiXWY074508; Sat, 5 Oct 2019 17:44:33 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201910051744.x95HiXWY074508@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sat, 5 Oct 2019 17:44:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353126 - in head/sys: fs/devfs kern sys X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: fs/devfs kern sys X-SVN-Commit-Revision: 353126 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.29 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: Sat, 05 Oct 2019 17:44:34 -0000 Author: mjg Date: Sat Oct 5 17:44:33 2019 New Revision: 353126 URL: https://svnweb.freebsd.org/changeset/base/353126 Log: devfs: plug redundant bwillwrite avoidance vn_write already checks for vnode type to see if bwillwrite should be called. This effectively reverts r244643. Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D21905 Modified: head/sys/fs/devfs/devfs_vnops.c head/sys/kern/sys_generic.c head/sys/sys/file.h Modified: head/sys/fs/devfs/devfs_vnops.c ============================================================================== --- head/sys/fs/devfs/devfs_vnops.c Sat Oct 5 17:36:33 2019 (r353125) +++ head/sys/fs/devfs/devfs_vnops.c Sat Oct 5 17:44:33 2019 (r353126) @@ -1137,7 +1137,6 @@ devfs_open(struct vop_open_args *ap) int error, ref, vlocked; struct cdevsw *dsw; struct file *fpop; - struct mtx *mtxp; if (vp->v_type == VBLK) return (ENXIO); @@ -1191,16 +1190,6 @@ devfs_open(struct vop_open_args *ap) #endif if (fp->f_ops == &badfileops) finit(fp, fp->f_flag, DTYPE_VNODE, dev, &devfs_ops_f); - mtxp = mtx_pool_find(mtxpool_sleep, fp); - - /* - * Hint to the dofilewrite() to not force the buffer draining - * on the writer to the file. Most likely, the write would - * not need normal buffers. - */ - mtx_lock(mtxp); - fp->f_vnread_flags |= FDEVFS_VNODE; - mtx_unlock(mtxp); return (error); } Modified: head/sys/kern/sys_generic.c ============================================================================== --- head/sys/kern/sys_generic.c Sat Oct 5 17:36:33 2019 (r353125) +++ head/sys/kern/sys_generic.c Sat Oct 5 17:44:33 2019 (r353126) @@ -561,9 +561,6 @@ dofilewrite(struct thread *td, int fd, struct file *fp ktruio = cloneuio(auio); #endif cnt = auio->uio_resid; - if (fp->f_type == DTYPE_VNODE && - (fp->f_vnread_flags & FDEVFS_VNODE) == 0) - bwillwrite(); if ((error = fo_write(fp, auio, td->td_ucred, flags, td))) { if (auio->uio_resid != cnt && (error == ERESTART || error == EINTR || error == EWOULDBLOCK)) Modified: head/sys/sys/file.h ============================================================================== --- head/sys/sys/file.h Sat Oct 5 17:36:33 2019 (r353125) +++ head/sys/sys/file.h Sat Oct 5 17:44:33 2019 (r353126) @@ -208,7 +208,6 @@ struct file { #define FOFFSET_LOCKED 0x1 #define FOFFSET_LOCK_WAITING 0x2 -#define FDEVFS_VNODE 0x4 #endif /* _KERNEL || _WANT_FILE */