Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Sep 2021 14:46:27 GMT
From:      Robert Wing <rew@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 78a7d255e45d - stable/13 - ffs: remove unused thread argument from ffs_reload()
Message-ID:  <202109211446.18LEkRhm015176@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by rew:

URL: https://cgit.FreeBSD.org/src/commit/?id=78a7d255e45dc04a389d4d2cc6697828a18245ae

commit 78a7d255e45dc04a389d4d2cc6697828a18245ae
Author:     Robert Wing <rew@FreeBSD.org>
AuthorDate: 2021-09-04 20:25:10 +0000
Commit:     Robert Wing <rew@FreeBSD.org>
CommitDate: 2021-09-21 14:38:38 +0000

    ffs: remove unused thread argument from ffs_reload()
    
    Reviewed by:    imp, kib
    Differential Revision:  https://reviews.freebsd.org/D31127
    
    (cherry picked from commit 440320b620a29fdc4033a2b9b67eb4401cb903bb)
---
 sys/ufs/ffs/ffs_extern.h  | 2 +-
 sys/ufs/ffs/ffs_suspend.c | 2 +-
 sys/ufs/ffs/ffs_vfsops.c  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 2ea828861b42..c835239986ba 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -89,7 +89,7 @@ int	ffs_own_mount(const struct mount *mp);
 int	ffs_reallocblks(struct vop_reallocblks_args *);
 int	ffs_realloccg(struct inode *, ufs2_daddr_t, ufs2_daddr_t,
 	    ufs2_daddr_t, int, int, int, struct ucred *, struct buf **);
-int	ffs_reload(struct mount *, struct thread *, int);
+int	ffs_reload(struct mount *, int);
 int	ffs_sbget(void *, struct fs **, off_t, struct malloc_type *,
 	    int (*)(void *, off_t, void **, int));
 int	ffs_sbput(void *, struct fs *, off_t, int (*)(void *, off_t, void *,
diff --git a/sys/ufs/ffs/ffs_suspend.c b/sys/ufs/ffs/ffs_suspend.c
index a7fef099cd70..d13097109758 100644
--- a/sys/ufs/ffs/ffs_suspend.c
+++ b/sys/ufs/ffs/ffs_suspend.c
@@ -265,7 +265,7 @@ ffs_susp_dtor(void *data)
 	KASSERT((mp->mnt_kern_flag & MNTK_SUSPEND) != 0,
 	    ("MNTK_SUSPEND not set"));
 
-	error = ffs_reload(mp, curthread, FFSR_FORCE | FFSR_UNSUSPEND);
+	error = ffs_reload(mp, FFSR_FORCE | FFSR_UNSUSPEND);
 	if (error != 0)
 		panic("failed to unsuspend writes on %s", fs->fs_fsmnt);
 
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 047c6f58a8a9..d5f20690793d 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -565,7 +565,7 @@ ffs_mount(struct mount *mp)
 			vfs_write_resume(mp, 0);
 		}
 		if ((mp->mnt_flag & MNT_RELOAD) &&
-		    (error = ffs_reload(mp, td, 0)) != 0)
+		    (error = ffs_reload(mp, 0)) != 0)
 			return (error);
 		if (fs->fs_ronly &&
 		    !vfs_flagopt(mp->mnt_optnew, "ro", NULL, 0)) {
@@ -876,7 +876,7 @@ ffs_cmount(struct mntarg *ma, void *data, uint64_t flags)
  *	7) re-read inode data for all active vnodes.
  */
 int
-ffs_reload(struct mount *mp, struct thread *td, int flags)
+ffs_reload(struct mount *mp, int flags)
 {
 	struct vnode *vp, *mvp, *devvp;
 	struct inode *ip;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109211446.18LEkRhm015176>