RFC: ATA to CAM integration patch (and gjournaled previuos nodes)

[Lucius Windschuh]

Hi Alexander.

2009/7/5 Alexander Motin <mav at freebsd.org>:
> It's never late. I have just uploaded fresh patch:
> http://people.freebsd.org/~mav/cam-ata.20090704.patch

"make buildworld" with this patch stops in my configuration with:

(cd /usr/src/rescue/rescue/../../usr.sbin/chown &&
/usr/obj/usr/src/make.i386/make -DRESCUE CRUNCH_CFLAGS=-DRESCUE
DIRPRFX=rescue/rescue/chown/ depend && /usr/obj/usr/src/make.i386/make
-DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/chown/ chown.o)
`chown.o' is up to date.
cc -static -o rescue rescue.o cat.lo chflags.lo chio.lo chmod.lo cp.lo
date.lo dd.lo df.lo echo.lo ed.lo expr.lo getfacl.lo hostname.lo
kenv.lo kill.lo ln.lo ls.lo mkdir.lo mv.lo pkill.lo ps.lo pwd.lo
realpath.lo rm.lo rmdir.lo setfacl.lo sh.lo stty.lo sync.lo test.lo
rcp.lo csh.lo atacontrol.lo badsect.lo camcontrol.lo ccdconfig.lo
clri.lo devfs.lo dmesg.lo dump.lo dumpfs.lo dumpon.lo fsck.lo
fsck_ffs.lo fsck_msdosfs.lo fsdb.lo fsirand.lo gbde.lo geom.lo
ifconfig.lo init.lo kldconfig.lo kldload.lo kldstat.lo kldunload.lo
ldconfig.lo md5.lo mdconfig.lo mdmfs.lo mknod.lo mount.lo
mount_cd9660.lo mount_msdosfs.lo mount_nfs.lo mount_ntfs.lo
mount_nullfs.lo mount_udf.lo mount_unionfs.lo newfs.lo newfs_msdos.lo
nos-tun.lo ping.lo reboot.lo restore.lo rcorder.lo route.lo routed.lo
rtquery.lo rtsol.lo savecore.lo spppcontrol.lo swapon.lo sysctl.lo
tunefs.lo umount.lo atmconfig.lo ping6.lo ipf.lo zfs.lo zpool.lo
bsdlabel.lo sconfig.lo fdisk.lo dhclient.lo head.lo mt.lo sed.lo
tail.lo tee.lo gzip.lo bzip2.lo tar.lo vi.lo id.lo chroot.lo chown.lo
/usr/obj/usr/src/rescue/rescue/../librescue/exec.o
/usr/obj/usr/src/rescue/rescue/../librescue/getusershell.o
/usr/obj/usr/src/rescue/rescue/../librescue/login_class.o
/usr/obj/usr/src/rescue/rescue/../librescue/popen.o
/usr/obj/usr/src/rescue/rescue/../librescue/rcmdsh.o
/usr/obj/usr/src/rescue/rescue/../librescue/sysctl.o
/usr/obj/usr/src/rescue/rescue/../librescue/system.o -lcrypt -ledit
-lkvm -ll -ltermcap -lutil -lalias -lcam -lcurses -ldevstat -lipsec
-lipx -lzfs -lnvpair -luutil -lavl -lgeom -lbsdxml -ljail -lkiconv
-lmd -lreadline -lsbuf -lufs -lz -lbz2 -larchive -lcrypto -lm
/usr/obj/usr/src/tmp/usr/lib/libcam.a(ata_all.o)(.text+0x263): In
function `ata_max_mode':
: undefined reference to `min'
*** Error code 1

Stop in /usr/obj/usr/src/rescue/rescue.
*** Error code 1

Stop in /usr/src/rescue/rescue.
*** Error code 1

Stop in /usr/src/rescue.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Simply adding
#ifndef min
#define min(a,b) (((a)<(b))?(a):(b))
#endif
in ata_all.c helps, obviously.

Regards,

Lucius