svn commit: r328763 - head/sbin/fsck_ffs

[Conrad Meyer]

There's one last sbwrite() in fsck_ffs, in the gjournal code.  Is that
one known to be safe, or should it also use sbput()?

Best,
Conrad

On Thu, Feb 1, 2018 at 4:07 PM, Kirk McKusick <mckusick at freebsd.org> wrote:
> Author: mckusick
> Date: Fri Feb  2 00:07:38 2018
> New Revision: 328763
> URL: https://svnweb.freebsd.org/changeset/base/328763
>
> Log:
>   Use sbput(3) rather than sbwrite(3) to ensure that the updated copy of
>   the superblock gets written.
>
>   Reported by: Mark Johnston <markj at FreeBSD.org>
>
> Modified:
>   head/sbin/fsck_ffs/suj.c
>
> Modified: head/sbin/fsck_ffs/suj.c
> ==============================================================================
> --- head/sbin/fsck_ffs/suj.c    Fri Feb  2 00:01:50 2018        (r328762)
> +++ head/sbin/fsck_ffs/suj.c    Fri Feb  2 00:07:38 2018        (r328763)
> @@ -213,8 +213,8 @@ closedisk(const char *devnam)
>         fs->fs_clean = 1;
>         fs->fs_time = time(NULL);
>         fs->fs_mtime = time(NULL);
> -       if (sbwrite(&disk, 0) == -1)
> -               err(EX_OSERR, "sbwrite(%s)", devnam);
> +       if (sbput(disk.d_fd, fs, 0) == -1)
> +               err(EX_OSERR, "sbput(%s)", devnam);
>         if (ufs_disk_close(&disk) == -1)
>                 err(EX_OSERR, "ufs_disk_close(%s)", devnam);
>         fs = NULL;
>