From nobody Sun Feb 19 05:47:16 2023 X-Original-To: dev-commits-src-branches@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 4PKF1c5F6lz3smTL; Sun, 19 Feb 2023 05:47:16 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PKF1c2KTvz3L4R; Sun, 19 Feb 2023 05:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676785636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f0dHiGKzlAUD3ajhgwVSRQ/GKqxPWnFD3rOhdUOCAxU=; b=QIryqUEpbZu7d5fDT0E+BP1sL+FOZuRJPS5/ddQtZ+80JBeJGnTIxUOt80lQJ2O0/jaDjW 6V60NpFbuE4FQIy14ofKFxr2h8XpxEVjVC9iKHkYr3/J7mXklaB9PLl0oLKhw70RsP/l6S ler7wAo+Qv14NoPxfZCkGwcXNENdNwfu0mjEYQgn/jwjXP0ieO1lvqMonBkq/AfNtaWc7b S+GcKvu1+65ZR+uWdsdis+annvu41XiYRXeMHfKrbxAPp2zcptDjOh7TwplNB0wV8AIQlJ Mwc+/nQQHOXvEAQOjCMFOn6ofHds7YNDDr/IbBnuAwXvPQXzlvT8IHj2hGYwbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676785636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f0dHiGKzlAUD3ajhgwVSRQ/GKqxPWnFD3rOhdUOCAxU=; b=evxirZ3P0uczhfYI+lIlFqMeypRRfEsz/ZQpfCkpMGgSTzFcKL0jtiZO8JFE/o000jN3a3 S6tF3yj5MiAL/LuDrEG4F4nyYbRx52YhBfxtUALVE1DHKNpjRLQWTY79mfDZZhTyc4KjqX M3lU69x2dh8h78tIyBUS9dFfijkukj4IY5GQhoV8dMM10hwyRImhPfFcuxut9J+sBWrmrZ oZuvCuiMO0NIr3xgwPJGuZoz85I31V6Se+9sp86ZFm5QLEAbrXneQ0WKY8c8ugBdW0Y2Pr +/uVezC1k5S8S9mkWnbVfZVE0kiNV8w7uSc9YK715+WhwrRQoDXD4nt7Oj9ixA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676785636; a=rsa-sha256; cv=none; b=CZLrF2AdCOjB+zOlf6MMiVrjkRPVLRvrsef2snrLDZYiDv37suTxi0dxbbf4pTHUQVv5aT Znrgd+jfu0vssrg12bLp2agiVqlAKfyEb1B5jYAJZmf1JgalRZmSff7oDWfhDt8vctEAjW mP7oWHUw71NuMHNJyfkti3JWLFQE+JBD53DNi5AeB3a64czffBCQsgDDYQ7YyHOnbYltoA DYWQECXUgT6dqz2MiOI1Lluvx9HcUeL6hAMN0qFaX5c+labPY61T1vE1ALwxvOMQrsPZAZ TXUU2yXdjHWtv5hF/f6z6wwUOjLXGHoAU/rtHbXomAGnwJ3mRi2Ch0+1C0gF7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PKF1c1NQVzrKj; Sun, 19 Feb 2023 05:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31J5lG1j097144; Sun, 19 Feb 2023 05:47:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31J5lGNW097143; Sun, 19 Feb 2023 05:47:16 GMT (envelope-from git) Date: Sun, 19 Feb 2023 05:47:16 GMT Message-Id: <202302190547.31J5lGNW097143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 64152225022b - stable/13 - msdosfs: correct handling of vnode pager size on file extension error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 64152225022bea784ca1948a67e7c040a8bb040a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=64152225022bea784ca1948a67e7c040a8bb040a commit 64152225022bea784ca1948a67e7c040a8bb040a Author: Konstantin Belousov AuthorDate: 2023-02-10 04:58:43 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-19 05:16:25 +0000 msdosfs: correct handling of vnode pager size on file extension error (cherry picked from commit e59180ea09a1d1d1463f2a269e94efa0f0b677c5) --- sys/fs/msdosfs/msdosfs_denode.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index 030c96d6d354..8511d873ea50 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -384,10 +384,8 @@ detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred) return (EINVAL); } - if (dep->de_FileSize < length) { - vnode_pager_setsize(DETOV(dep), length); + if (dep->de_FileSize < length) return (deextend(dep, length, cred)); - } /* * If the desired length is 0 then remember the starting cluster of @@ -528,6 +526,7 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) return (error); } } + vnode_pager_setsize(DETOV(dep), length); dep->de_FileSize = length; dep->de_flag |= DE_UPDATE | DE_MODIFIED; return (deupdat(dep, !DOINGASYNC(DETOV(dep))));