From nobody Fri May 20 20:48:53 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A8AAA1B3A06B; Fri, 20 May 2022 20:49:00 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L4f3044nZz3lcW; Fri, 20 May 2022 20:49:00 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-oi1-x232.google.com with SMTP id v65so11255349oig.10; Fri, 20 May 2022 13:49:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=mnlBuYaFA3FJ7yb++XAU/walLXYYzLZMEX/gLTYhCC0=; b=oELaJhucQ40jHGQiFR8hJzyGEVHN7963iwgJuKAOqODXrjPPP4xwUMWAQIPM7aPEOI mPNQ1LQMGGzas4vzbNjlCTwJ+rJuF1X7Y37o3yjZ2qM+3SF2KXZ12uIMFxDXWul/2aMB BYRmTXWQ8DENx4WvW8S8Yu6LOFD/UPwxdyYs/YZsu2Iudh4Lynk2m1ZhjLv4oI6kB4eV w08d5clxfj6GhYCG6Hpbf1rllapdTjx/b2w9xDQbGBDdP0Oxzu8q3bCTXyCMionRH4nk rNro3LjgU4hPWmZ36VcIDBJt1g1TwPqYI87ylbdTyIJE7rQ4dz7JafWZz0jXRcriKi6+ NNwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=mnlBuYaFA3FJ7yb++XAU/walLXYYzLZMEX/gLTYhCC0=; b=aK/4TexaiHYOE95uO0E9phtucGLecD1m/eerEdFOh5WOUEworUkaX9nK6UpZ6JTust B3vZGqUFnugj92QcMpswW8HWYLrp7zwctIQUnDsI2E763LFVMQpdjgCRUYzzHsZjFWO0 dyA3MjTU19XwI7aepFCLAN6bXjPW4+eCmLCpcjkmCdqqhswkirzGho2JBvBfofJUb51V HA1AnZzJLbl6seGvcfj6AGJoYF2F19EolIfmfG36/99wzpdWM58sO7stkwo9LHZtMtyb mTKt6smndssZX0FsfkYBdX1HrSjQciLTf+54Bs8vQiT7jIhNGlpeV37DN/4jwxlo7sIS XfYA== X-Gm-Message-State: AOAM533AKo1kK8GFwCPLfedf3eW4OIWJIGmiegjg4qH3eL5GDGEEUcuW q48n4OiQUKYRbn0bmLIcUP4CJr6SRCDFjRdghtrvBS+S X-Google-Smtp-Source: ABdhPJwJSxJChd/aGO8o1unhGzJEvobu0kyZnkG+JXIdShhsBTv+WeY+YUWntKoiu1s5mRFohzsuiXw995VBq/TSRYg= X-Received: by 2002:a54:4688:0:b0:325:9a36:ecfe with SMTP id k8-20020a544688000000b003259a36ecfemr6996304oic.96.1653079734159; Fri, 20 May 2022 13:48:54 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:5ec3:0:b0:42a:2dcb:b9 with HTTP; Fri, 20 May 2022 13:48:53 -0700 (PDT) In-Reply-To: References: <202205201725.24KHPxLt058778@gitrepo.freebsd.org> From: Mateusz Guzik Date: Fri, 20 May 2022 22:48:53 +0200 Message-ID: Subject: Re: git: ec3c225711ae - main - vfs: call vn_truncate_locked from kern_truncate To: Dmitry Chagin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4L4f3044nZz3lcW X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N weird. i'm on it. On 5/20/22, Dmitry Chagin wrote: > On Fri, May 20, 2022 at 05:25:59PM +0000, Mateusz Guzik wrote: >> The branch main has been updated by mjg: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=ec3c225711ae7d5b8e71ed036aada09ef91149ec >> >> commit ec3c225711ae7d5b8e71ed036aada09ef91149ec >> Author: Mateusz Guzik >> AuthorDate: 2022-05-16 01:28:22 +0000 >> Commit: Mateusz Guzik >> CommitDate: 2022-05-20 17:25:51 +0000 >> >> vfs: call vn_truncate_locked from kern_truncate >> >> This fixes a bug where the syscall would not bump writecount. >> >> PR: 263999 >> --- >> sys/kern/vfs_syscalls.c | 22 ++++++++++++---------- >> 1 file changed, 12 insertions(+), 10 deletions(-) >> >> diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c >> index 86ef3fc7a095..600299fbe6eb 100644 >> --- a/sys/kern/vfs_syscalls.c >> +++ b/sys/kern/vfs_syscalls.c >> @@ -3460,7 +3460,6 @@ kern_truncate(struct thread *td, const char *path, >> enum uio_seg pathseg, >> struct mount *mp; >> struct vnode *vp; >> void *rl_cookie; >> - struct vattr vattr; >> struct nameidata nd; >> int error; >> >> @@ -3480,18 +3479,21 @@ retry: >> return (error); >> } >> vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); >> - if (vp->v_type == VDIR) >> + if (vp->v_type == VDIR) { >> error = EISDIR; >> -#ifdef MAC >> - else if ((error = mac_vnode_check_write(td->td_ucred, NOCRED, vp))) { >> + goto out; >> } >> +#ifdef MAC >> + error = mac_vnode_check_write(td->td_ucred, NOCRED, vp); >> + if (error != 0) >> + goto out; >> #endif >> - else if ((error = vn_writechk(vp)) == 0 && >> - (error = VOP_ACCESS(vp, VWRITE, td->td_ucred, td)) == 0) { >> - VATTR_NULL(&vattr); >> - vattr.va_size = length; >> - error = VOP_SETATTR(vp, &vattr, td->td_ucred); >> - } >> + error = VOP_ACCESS(vp, VWRITE, td->td_ucred, td); >> + if (error != 0) >> + goto out; >> + >> + error = vn_truncate_locked(vp, 0, false, td->td_ucred); >> +out: >> VOP_UNLOCK(vp); >> vn_finished_write(mp); >> vn_rangelock_unlock(vp, rl_cookie); > > seems this broke truncate, test attached. > > > -- Mateusz Guzik