Re: CVS commit: src/sys

[John Nemeth <jnemeth%cue.bc.ca@localhost>]

On Dec 31,  2:52pm, "Christos Zoulas" wrote:
}
} This is a multi-part message in MIME format.
} 
} --_----------=_14200555275200
} Content-Disposition: inline
} Content-Transfer-Encoding: 8bit
} Content-Type: text/plain; charset="US-ASCII"
} 
} Module Name:	src
} Committed By:	christos
} Date:		Wed Dec 31 19:52:06 UTC 2014
} 
} Modified Files:
} 	src/sys/arch/amiga/dev: fd.c
} 	src/sys/arch/atari/dev: fd.c hdfd.c
} 	src/sys/arch/emips/ebus: ace_ebus.c flash_ebus.c
} 	src/sys/arch/hp300/dev: rd.c
} 	src/sys/arch/mac68k/obio: iwm_fd.c
} 	src/sys/arch/sun3/dev: xd.c xy.c
} 	src/sys/arch/vax/mba: hp.c
} 	src/sys/arch/vax/vsa: hdc9224.c
} 	src/sys/arch/x68k/dev: bmd.c fd.c
} 	src/sys/dev: ccd.c cgd.c dksubr.c ld.c md.c vnd.c
} 	src/sys/dev/ata: wd.c
} 	src/sys/dev/dkwedge: dk.c
} 	src/sys/dev/gpib: rd.c
} 	src/sys/dev/isa: fd.c mcd.c
} 	src/sys/dev/mca: ed_mca.c
} 	src/sys/dev/mscp: mscp_disk.c
} 	src/sys/dev/ofw: ofdisk.c
} 	src/sys/dev/qbus: rf.c rl.c
} 	src/sys/dev/raidframe: rf_netbsdkintf.c
} 	src/sys/dev/scsipi: cd.c sd.c
} 	src/sys/dev/vme: xd.c xy.c
} 	src/sys/kern: subr_disk.c
} 	src/sys/sys: param.h
} 
} Log Message:
} make more drivers use disk_ioctl, and add a dev parameter to it so that
} we can merge the "easy" disklabel ioctls to it. Ultimately all this will
} go do dk_ioctl once all the drivers have been converted.
} 
} 
} To generate a diff of this commit:
} cvs rdiff -u -r1.92 -r1.93 src/sys/arch/amiga/dev/fd.c
} cvs rdiff -u -r1.80 -r1.81 src/sys/arch/atari/dev/fd.c
} cvs rdiff -u -r1.78 -r1.79 src/sys/arch/atari/dev/hdfd.c
} cvs rdiff -u -r1.15 -r1.16 src/sys/arch/emips/ebus/ace_ebus.c
} cvs rdiff -u -r1.13 -r1.14 src/sys/arch/emips/ebus/flash_ebus.c
} cvs rdiff -u -r1.98 -r1.99 src/sys/arch/hp300/dev/rd.c
} cvs rdiff -u -r1.50 -r1.51 src/sys/arch/mac68k/obio/iwm_fd.c
} cvs rdiff -u -r1.71 -r1.72 src/sys/arch/sun3/dev/xd.c
} cvs rdiff -u -r1.76 -r1.77 src/sys/arch/sun3/dev/xy.c
} cvs rdiff -u -r1.50 -r1.51 src/sys/arch/vax/mba/hp.c
} cvs rdiff -u -r1.54 -r1.55 src/sys/arch/vax/vsa/hdc9224.c
} cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x68k/dev/bmd.c
} cvs rdiff -u -r1.111 -r1.112 src/sys/arch/x68k/dev/fd.c
} cvs rdiff -u -r1.160 -r1.161 src/sys/dev/ccd.c
} cvs rdiff -u -r1.93 -r1.94 src/sys/dev/cgd.c
} cvs rdiff -u -r1.57 -r1.58 src/sys/dev/dksubr.c
} cvs rdiff -u -r1.79 -r1.80 src/sys/dev/ld.c
} cvs rdiff -u -r1.71 -r1.72 src/sys/dev/md.c
} cvs rdiff -u -r1.237 -r1.238 src/sys/dev/vnd.c
} cvs rdiff -u -r1.416 -r1.417 src/sys/dev/ata/wd.c
} cvs rdiff -u -r1.77 -r1.78 src/sys/dev/dkwedge/dk.c
} cvs rdiff -u -r1.36 -r1.37 src/sys/dev/gpib/rd.c
} cvs rdiff -u -r1.105 -r1.106 src/sys/dev/isa/fd.c
} cvs rdiff -u -r1.113 -r1.114 src/sys/dev/isa/mcd.c
} cvs rdiff -u -r1.60 -r1.61 src/sys/dev/mca/ed_mca.c
} cvs rdiff -u -r1.83 -r1.84 src/sys/dev/mscp/mscp_disk.c
} cvs rdiff -u -r1.49 -r1.50 src/sys/dev/ofw/ofdisk.c
} cvs rdiff -u -r1.29 -r1.30 src/sys/dev/qbus/rf.c
} cvs rdiff -u -r1.47 -r1.48 src/sys/dev/qbus/rl.c
} cvs rdiff -u -r1.319 -r1.320 src/sys/dev/raidframe/rf_netbsdkintf.c
} cvs rdiff -u -r1.326 -r1.327 src/sys/dev/scsipi/cd.c
} cvs rdiff -u -r1.312 -r1.313 src/sys/dev/scsipi/sd.c
} cvs rdiff -u -r1.93 -r1.94 src/sys/dev/vme/xd.c
} cvs rdiff -u -r1.97 -r1.98 src/sys/dev/vme/xy.c
} cvs rdiff -u -r1.107 -r1.108 src/sys/kern/subr_disk.c
} cvs rdiff -u -r1.463 -r1.464 src/sys/sys/param.h
} 
} Please note that diffs are not public domain; they are subject to the
} copyright notices on the relevant files.
} 
} 
} --_----------=_14200555275200
} Content-Disposition: inline
} Content-Length: 57121
} Content-Transfer-Encoding: binary
} Content-Type: text/x-diff; charset=us-ascii
} 
} Modified files:
} 
} Index: src/sys/arch/amiga/dev/fd.c
} diff -u src/sys/arch/amiga/dev/fd.c:1.92 src/sys/arch/amiga/dev/fd.c:1.93
} --- src/sys/arch/amiga/dev/fd.c:1.92	Fri Aug  8 17:13:52 2014
} +++ src/sys/arch/amiga/dev/fd.c	Wed Dec 31 14:52:04 2014
} @@ -1,4 +1,4 @@
} -/*	$NetBSD: fd.c,v 1.92 2014/08/08 21:13:52 joerg Exp $ */
} +/*	$NetBSD: fd.c,v 1.93 2014/12/31 19:52:04 christos Exp $ */
}  
}  /*
}   * Copyright (c) 1994 Christian E. Hopps
} @@ -33,7 +33,7 @@
}   */
}  
}  #include <sys/cdefs.h>
} -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.92 2014/08/08 21:13:52 joerg Exp $");
} +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.93 2014/12/31 19:52:04 christos Exp $");
}  
}  #include <sys/param.h>
}  #include <sys/systm.h>
} @@ -573,6 +573,10 @@ fdioctl(dev_t dev, u_long cmd, void *add
}  	if ((sc->flags & FDF_HAVELABEL) == 0)
}  		return(EBADF);
}  
} +	error = disk_ioctl(&sk->dkdev, dev, cmd, addr, flag, l);
} +	if (error != EPASSTHROUGH)
} +		return error;
} +

     When adding this stanza to drivers, should you not set "error = 0;"
after it just to be safe?  It seems that some drivers aren't very
clean in the way they deal with "error" and/or are not expecting
it to be set at this point.

[snip]

}-- End of excerpt from "Christos Zoulas"