From owner-svn-src-all@freebsd.org Fri Dec 4 16:05:32 2020 Return-Path: Delivered-To: svn-src-all@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 2C3314A484E; Fri, 4 Dec 2020 16:05:32 +0000 (UTC) (envelope-from kib@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CncxS0qtqz4tsm; Fri, 4 Dec 2020 16:05:32 +0000 (UTC) (envelope-from kib@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 0F8846689; Fri, 4 Dec 2020 16:05:32 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B4G5V06072520; Fri, 4 Dec 2020 16:05:31 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B4G5VWQ072519; Fri, 4 Dec 2020 16:05:31 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202012041605.0B4G5VWQ072519@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 4 Dec 2020 16:05:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r368339 - stable/12/sys/fs/msdosfs X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/12/sys/fs/msdosfs X-SVN-Commit-Revision: 368339 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Dec 2020 16:05:32 -0000 Author: kib Date: Fri Dec 4 16:05:31 2020 New Revision: 368339 URL: https://svnweb.freebsd.org/changeset/base/368339 Log: Fix msdosfs suspension. Unlike HEAD, stable/12 still uses the check for vfs_susp_clean != NULL as indicator that fs supports suspension. Satisfy the requirement by providing dummy msdosfs_susp_clean method implementation. This is direct commit to stable/12. Reported by: Özkan KIRIK Modified: stable/12/sys/fs/msdosfs/msdosfs_vfsops.c Modified: stable/12/sys/fs/msdosfs/msdosfs_vfsops.c ============================================================================== --- stable/12/sys/fs/msdosfs/msdosfs_vfsops.c Fri Dec 4 15:53:44 2020 (r368338) +++ stable/12/sys/fs/msdosfs/msdosfs_vfsops.c Fri Dec 4 16:05:31 2020 (r368339) @@ -989,6 +989,11 @@ msdosfs_fhtovp(struct mount *mp, struct fid *fhp, int return (0); } +static void +msdosfs_susp_clean(struct mount *mp __unused) +{ +} + static struct vfsops msdosfs_vfsops = { .vfs_fhtovp = msdosfs_fhtovp, .vfs_mount = msdosfs_mount, @@ -997,6 +1002,7 @@ static struct vfsops msdosfs_vfsops = { .vfs_statfs = msdosfs_statfs, .vfs_sync = msdosfs_sync, .vfs_unmount = msdosfs_unmount, + .vfs_susp_clean = msdosfs_susp_clean, }; VFS_SET(msdosfs_vfsops, msdosfs, 0);