diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2016-10-17 01:16:23 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2016-10-17 01:16:23 +0000 |
| commit | 629e6deb76d282a4984e12e9eae6ec0e6e2159db (patch) | |
| tree | 998e623b3fc26227cde449b06235fc89f5b1d9d8 /usr.sbin/makefs/ffs.c | |
| parent | 7e193923b69edb381d1476ba4be27463cabbe688 (diff) | |
mechanical rename of vnode to mkfsvnode and buf to mkfsbuf to avoid
collisions with the kernel structures of the same name.
caught one bug where the wrong header was being included.
Diffstat (limited to 'usr.sbin/makefs/ffs.c')
| -rw-r--r-- | usr.sbin/makefs/ffs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index e2ee71bc3af..ca456847021 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs.c,v 1.7 2016/10/16 22:26:34 tedu Exp $ */ +/* $OpenBSD: ffs.c,v 1.8 2016/10/17 01:16:22 tedu Exp $ */ /* $NetBSD: ffs.c,v 1.66 2015/12/21 00:58:08 christos Exp $ */ /* @@ -845,9 +845,9 @@ ffs_write_file(union dinode *din, uint32_t ino, void *buf, fsinfo_t *fsopts) off_t bufleft, chunk, offset; ssize_t nread; struct inode in; - struct buf * bp; + struct mkfsbuf * bp; ffs_opt_t *ffs_opts = fsopts->fs_specific; - struct vnode vp = { fsopts, NULL }; + struct mkfsvnode vp = { fsopts, NULL }; assert (din != NULL); assert (buf != NULL); |