D35922.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D35922.diff
View Options

	diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
	--- a/stand/libsa/Makefile
	+++ b/stand/libsa/Makefile
	@@ -170,7 +170,6 @@
	.PATH: ${SRCTOP}/sys/ufs/ffs
	SRCS+=ffs_subr.c ffs_tables.c

	-CFLAGS.ufs.c+= -I${LDRSRC}
	CFLAGS.gzipfs.c+= ${ZLIB_CFLAGS}
	CFLAGS.pkgfs.c+= ${ZLIB_CFLAGS}
	CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO -DBZ_NO_COMPRESS
	diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c
	--- a/stand/libsa/ufs.c
	+++ b/stand/libsa/ufs.c
	@@ -81,7 +81,6 @@
	#include <ufs/ufs/dir.h>
	#include <ufs/ffs/fs.h>
	#include "stand.h"
	-#include "disk.h"
	#include "string.h"

	static int ufs_open(const char path, struct open_file f);
	@@ -520,7 +519,7 @@
	return (errno);
	f->f_fsdata = (void *)fp;

	- dev = disk_fmtdev(f->f_devdata);
	+ dev = devformat((struct devdesc *)f->f_devdata);
	/* Is this device mounted? */
	STAILQ_FOREACH(mnt, &mnt_list, um_link) {
	if (strcmp(dev, mnt->um_dev) == 0)
	@@ -739,7 +738,7 @@
	}
	free(fp->f_buf);

	- dev = disk_fmtdev(f->f_devdata);
	+ dev = devformat((struct devdesc *)f->f_devdata);
	STAILQ_FOREACH(mnt, &mnt_list, um_link) {
	if (strcmp(dev, mnt->um_dev) == 0)
	break;