From owner-svn-src-head@freebsd.org Tue Jun 23 21:28:27 2020 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 7B40E339B41; Tue, 23 Jun 2020 21:28:27 +0000 (UTC) (envelope-from mckusick@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 49rzsl2kKsz49GK; Tue, 23 Jun 2020 21:28:27 +0000 (UTC) (envelope-from mckusick@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 3EFFA26F86; Tue, 23 Jun 2020 21:28:27 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05NLSRgV034049; Tue, 23 Jun 2020 21:28:27 GMT (envelope-from mckusick@FreeBSD.org) Received: (from mckusick@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05NLSQXI034045; Tue, 23 Jun 2020 21:28:26 GMT (envelope-from mckusick@FreeBSD.org) Message-Id: <202006232128.05NLSQXI034045@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mckusick set sender to mckusick@FreeBSD.org using -f From: Kirk McKusick Date: Tue, 23 Jun 2020 21:28:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r362559 - in head: lib/libufs sbin/fsck_ffs X-SVN-Group: head X-SVN-Commit-Author: mckusick X-SVN-Commit-Paths: in head: lib/libufs sbin/fsck_ffs X-SVN-Commit-Revision: 362559 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.33 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: Tue, 23 Jun 2020 21:28:27 -0000 Author: mckusick Date: Tue Jun 23 21:28:26 2020 New Revision: 362559 URL: https://svnweb.freebsd.org/changeset/base/362559 Log: The libufs library needs to track and free the new fs_si structure in addition to the fs_csp structure that it references. PR: 247425 Sponsored by: Netflix Modified: head/lib/libufs/libufs.h head/lib/libufs/sblock.c head/lib/libufs/type.c head/sbin/fsck_ffs/setup.c Modified: head/lib/libufs/libufs.h ============================================================================== --- head/lib/libufs/libufs.h Tue Jun 23 21:17:13 2020 (r362558) +++ head/lib/libufs/libufs.h Tue Jun 23 21:28:26 2020 (r362559) @@ -49,7 +49,7 @@ struct uufsd { int d_fd; /* raw device file descriptor */ long d_bsize; /* device bsize */ ufs2_daddr_t d_sblock; /* superblock location */ - struct csum *d_sbcsum; /* Superblock summary info */ + struct fs_summary_info *d_si; /* Superblock summary info */ caddr_t d_inoblock; /* inode block */ uint32_t d_inomin; /* low ino, not ino_t for ABI compat */ uint32_t d_inomax; /* high ino, not ino_t for ABI compat */ Modified: head/lib/libufs/sblock.c ============================================================================== --- head/lib/libufs/sblock.c Tue Jun 23 21:17:13 2020 (r362558) +++ head/lib/libufs/sblock.c Tue Jun 23 21:28:26 2020 (r362559) @@ -88,7 +88,7 @@ sbread(struct uufsd *disk) disk->d_ufs = 2; disk->d_bsize = fs->fs_fsize / fsbtodb(fs, 1); disk->d_sblock = fs->fs_sblockloc / disk->d_bsize; - disk->d_sbcsum = fs->fs_csp; + disk->d_si = fs->fs_si; return (0); } Modified: head/lib/libufs/type.c ============================================================================== --- head/lib/libufs/type.c Tue Jun 23 21:17:13 2020 (r362558) +++ head/lib/libufs/type.c Tue Jun 23 21:28:26 2020 (r362559) @@ -69,9 +69,10 @@ ufs_disk_close(struct uufsd *disk) free((char *)(uintptr_t)disk->d_name); disk->d_name = NULL; } - if (disk->d_sbcsum != NULL) { - free(disk->d_sbcsum); - disk->d_sbcsum = NULL; + if (disk->d_si != NULL) { + free(disk->d_si->si_csp); + free(disk->d_si); + disk->d_si = NULL; } return (0); } @@ -164,7 +165,7 @@ again: if ((ret = stat(name, &st)) < 0) { disk->d_mine = 0; disk->d_ufs = 0; disk->d_error = NULL; - disk->d_sbcsum = NULL; + disk->d_si = NULL; if (oname != name) { name = strdup(name); Modified: head/sbin/fsck_ffs/setup.c ============================================================================== --- head/sbin/fsck_ffs/setup.c Tue Jun 23 21:17:13 2020 (r362558) +++ head/sbin/fsck_ffs/setup.c Tue Jun 23 21:28:26 2020 (r362559) @@ -216,7 +216,7 @@ setup(char *dev) disk.d_ufs = (sblock.fs_magic == FS_UFS1_MAGIC) ? 1 : 2; disk.d_bsize = sblock.fs_fsize / fsbtodb(&sblock, 1); disk.d_sblock = sblock.fs_sblockloc / disk.d_bsize; - disk.d_sbcsum = sblock.fs_csp; + disk.d_si = sblock.fs_si; if (skipclean && ckclean && sblock.fs_clean) { pwarn("FILE SYSTEM CLEAN; SKIPPING CHECKS\n");