d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In the newfs(8) utility, use the more appropriate sbwrite() and cgwrite()

Browse Source 
libufs interfaces rather than sbput() and cgput().

No functional change.

MFC after:    7 days
Sponsored by: Netflix
This commit is contained in:
Kirk McKusick 2020-09-13 22:57:50 +00:00
parent e44d86731e
commit 314a6544c5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sbin/newfs/mkfs.c
View File

@ -556,8 +556,8 @@ restart:
* Reference the summary information so it will also be written. * Reference the summary information so it will also be written.
*/ */
sblock.fs_csp = fscs; sblock.fs_csp = fscs;
if (!Nflag && sbput(disk.d_fd, &disk.d_fs, 0) != 0) if (!Nflag && sbwrite(&disk, 0) != 0)
err(1, "sbput: %s", disk.d_error); err(1, "sbwrite: %s", disk.d_error);
if (Xflag == 1) { if (Xflag == 1) {
printf("** Exiting on Xflag 1\n"); printf("** Exiting on Xflag 1\n");
exit(0); exit(0);
@ -619,8 +619,8 @@ restart:
printf("** Exiting on Xflag 3\n"); printf("** Exiting on Xflag 3\n");
exit(0); exit(0);
} }
if (sbput(disk.d_fd, &disk.d_fs, 0) != 0) if (sbwrite(&disk, 0) != 0)
err(1, "sbput: %s", disk.d_error); err(1, "sbwrite: %s", disk.d_error);
/* /*
* For UFS1 filesystems with a blocksize of 64K, the first * For UFS1 filesystems with a blocksize of 64K, the first
* alternate superblock resides at the location used for * alternate superblock resides at the location used for
@ -811,11 +811,11 @@ initcg(int cylno, time_t utime)
savedactualloc = sblock.fs_sblockactualloc; savedactualloc = sblock.fs_sblockactualloc;
sblock.fs_sblockactualloc = sblock.fs_sblockactualloc =
dbtob(fsbtodb(&sblock, cgsblock(&sblock, cylno))); dbtob(fsbtodb(&sblock, cgsblock(&sblock, cylno)));
if (sbput(disk.d_fd, &disk.d_fs, 0) != 0) if (sbwrite(&disk, 0) != 0)
err(1, "sbput: %s", disk.d_error); err(1, "sbwrite: %s", disk.d_error);
sblock.fs_sblockactualloc = savedactualloc; sblock.fs_sblockactualloc = savedactualloc;
if (cgput(&disk, &acg) != 0) if (cgwrite(&disk) != 0)
err(1, "initcg: cgput: %s", disk.d_error); err(1, "initcg: cgwrite: %s", disk.d_error);
start = 0; start = 0;
dp1 = (struct ufs1_dinode *)(&iobuf[start]); dp1 = (struct ufs1_dinode *)(&iobuf[start]);
dp2 = (struct ufs2_dinode *)(&iobuf[start]); dp2 = (struct ufs2_dinode *)(&iobuf[start]);
@ -1024,8 +1024,8 @@ goth:
for (i = frag; i < sblock.fs_frag; i++) for (i = frag; i < sblock.fs_frag; i++)
setbit(cg_blksfree(&acg), d + i); setbit(cg_blksfree(&acg), d + i);
} }
if (cgput(&disk, &acg) != 0) if (cgwrite(&disk) != 0)
err(1, "alloc: cgput: %s", disk.d_error); err(1, "alloc: cgwrite: %s", disk.d_error);
return ((ufs2_daddr_t)d); return ((ufs2_daddr_t)d);
} }
@ -1045,8 +1045,8 @@ iput(union dinode *ip, ino_t ino)
} }
acg.cg_cs.cs_nifree--; acg.cg_cs.cs_nifree--;
setbit(cg_inosused(&acg), ino); setbit(cg_inosused(&acg), ino);
if (cgput(&disk, &acg) != 0) if (cgwrite(&disk) != 0)
err(1, "iput: cgput: %s", disk.d_error); err(1, "iput: cgwrite: %s", disk.d_error);
sblock.fs_cstotal.cs_nifree--; sblock.fs_cstotal.cs_nifree--;
fscs[0].cs_nifree--; fscs[0].cs_nifree--;
if (getinode(&disk, &dp, ino) == -1) { if (getinode(&disk, &dp, ino) == -1) {