From nobody Wed Apr 13 21:04:01 2022 X-Original-To: dev-commits-src-all@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 B4E681B4C57D; Wed, 13 Apr 2022 21:04:01 +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 4Kdw7P2zqWz3wRG; Wed, 13 Apr 2022 21:04:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649883841; 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=1SHNzJopRkZm/SdUTkkkiyQTmhmgUgQYRCAw0hwinSE=; b=JX6HaeVl9ahJB0veiZ1dTjWGNDOh972QyopE+lmOS40KSmTk045ZDxxR+Y5k4Hmyu4bJE2 r80cNowAWLju/LYZlOyxpnFgi7uMq1bCAsGsu/5DxpuXiJSmi61yZNoHMtBpc5YgF6RAx6 MIwJ49r4TXEiE28dz63YFcxck5NhpXRYYGbFgzdA9YnYZ8EAjwdG0ryTGL0o3bIFn64iXH 3lZuJ54odUptFjglvxNmEFzfIJXRB2cjAAaP8AQakoZXaWhickDrbyD3LYrKJ+7eHVSBIW wpurH+wYHzGbjfBO8zjaQg+48QyBPxzao20ibYOZ7Fr906ixiML5KPRgXVhyEg== 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 2C77F1391F; Wed, 13 Apr 2022 21:04:01 +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 23DL415L012344; Wed, 13 Apr 2022 21:04:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DL4192012343; Wed, 13 Apr 2022 21:04:01 GMT (envelope-from git) Date: Wed, 13 Apr 2022 21:04:01 GMT Message-Id: <202204132104.23DL4192012343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Wing Subject: git: 34116aa48131 - stable/13 - ffs_mount(): fix snapshotting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 34116aa48131d44ddeaa14f7769d013981c0d01b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649883841; 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=1SHNzJopRkZm/SdUTkkkiyQTmhmgUgQYRCAw0hwinSE=; b=iKQsoQikfQqfmxKGZUOw3Bbh0vwi6Tjdgm9AtQIo5onbtO1eeJKNi6IDw213yWBV9iUCSe K3kLnjPTKConB8QAMx62uspXbE9hw85nGtw+AWNfnE5Pn3DEO8Xz4TWTnoZMp08gr1m0aL FfSzh1qmA39B3u7WqH3oPOa5B7QdYrqjTocd8H1XHawmuq4uj6CFUjj9TpeH+zpEA1mmRf 71IZCQH+jDD3aEqwoeF+RY3aObFBRYEXv3Cm/sjFbj0GvvPTP+38V3vH7gWDws5kxYMqsU waytUTJtrUrhy0WlIKJF4YU7DnjF/KgV/km/b5m2G2KmGgIKw3dOm/SVbPQbnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649883841; a=rsa-sha256; cv=none; b=SRfh8Gpxo1xPItiycLhYPXwBEptU7outXQxhuTPrAnpA4Lhez4qOgpMa6g+band0baI4eo dyBqWSl5Tkw6nKjN14/PgCxFVcTggRYPM4r3JGcoL4CMu6NqS3O3SmzGezch7q9XtjvTyn 3Oq0vFAYG4lYS+DgMVfjGltRqMfe7c6hKRcpTK3GQMM+3H7L5kB2R5EWuAgGA+TTUuvurs vaFRWSuuMZIkNPdnpGGrOyY3Fa5ah9mHsDNQHGnjzKE0MGaMLS87Mhm6ITl2aWCgbtLvVg ASC5VGGGC9zvWsOx+ublvQFloK8EQMza30h8p0zYhSE1tOGx3UpKDXw6PdhW7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=34116aa48131d44ddeaa14f7769d013981c0d01b commit 34116aa48131d44ddeaa14f7769d013981c0d01b Author: Robert Wing AuthorDate: 2022-03-17 01:27:34 +0000 Commit: Robert Wing CommitDate: 2022-04-13 20:59:12 +0000 ffs_mount(): fix snapshotting Commit 0455cc7104ec broke snapshotting for ffs. In that commit, ffs_mount() was changed so the namei() lookup for a disk device happens before ffs_snapshot(). This caused the issue where namei() would lookup the snapshot file and fail because the file doesn't exist. Even if it did exist, taking a snapshot would still fail since it's not a disk device. Fix this by taking a snapshot of the filesystem as-is and return without altering ro/rw or any other attributes that are passed in. Reported by: pho Reviewed by: mckusick Fixes: 0455cc7104ec ("ffs_mount(): return early if namei() fails to lookup disk device") Differential Revision: https://reviews.freebsd.org/D34562 (cherry picked from commit ab2dbd9b871dd00afc6ad78acb386ffa48b6b053) --- sys/ufs/ffs/ffs_vfsops.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 2eae7c5fa630..3997c026859c 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -437,6 +437,12 @@ ffs_mount(struct mount *mp) mp->mnt_flag |= mntorflags; MNT_IUNLOCK(mp); + /* + * If this is a snapshot request, take the snapshot. + */ + if (mp->mnt_flag & MNT_SNAPSHOT) + return (ffs_snapshot(mp, fspec)); + /* * Must not call namei() while owning busy ref. */ @@ -711,11 +717,6 @@ ffs_mount(struct mount *mp) MNT_IUNLOCK(mp); } - /* - * If this is a snapshot request, take the snapshot. - */ - if (mp->mnt_flag & MNT_SNAPSHOT) - return (ffs_snapshot(mp, fspec)); } MNT_ILOCK(mp);