diff options
| author | mckusick <mckusick@FreeBSD.org> | 2000-06-22 00:29:53 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 2000-06-22 00:29:53 +0000 |
| commit | aa0e1b74b037222da6dcb93b9dea7ce7ea67de05 (patch) | |
| tree | a53aa181207e832b0326754abfcbdb530f4ac329 /sys/ufs/ffs/softdep.h | |
| parent | 8bd069edd69b70e3312829e2c8fc645c8f38ab51 (diff) | |
| download | FreeBSD-src-aa0e1b74b037222da6dcb93b9dea7ce7ea67de05.zip FreeBSD-src-aa0e1b74b037222da6dcb93b9dea7ce7ea67de05.tar.gz | |
Update to new copyright.
Diffstat (limited to 'sys/ufs/ffs/softdep.h')
| -rw-r--r-- | sys/ufs/ffs/softdep.h | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h index 8bbc409..1908a3e 100644 --- a/sys/ufs/ffs/softdep.h +++ b/sys/ufs/ffs/softdep.h @@ -1,20 +1,16 @@ /* - * Copyright 1998 Marshall Kirk McKusick. All Rights Reserved. + * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved. * * The soft updates code is derived from the appendix of a University * of Michigan technical report (Gregory R. Ganger and Yale N. Patt, * "Soft Updates: A Solution to the Metadata Update Problem in File * Systems", CSE-TR-254-95, August 1995). * - * The following are the copyrights and redistribution conditions that - * apply to this copy of the soft update software. For a license - * to use, redistribute or sell the soft update software under - * conditions other than those described here, please contact the - * author at one of the following addresses: + * Further information about soft updates can be obtained from: * - * Marshall Kirk McKusick mckusick@mckusick.com - * 1614 Oxford Street +1-510-843-9542 - * Berkeley, CA 94709-1608 + * Marshall Kirk McKusick http://www.mckusick.com/softdep/ + * 1614 Oxford Street mckusick@mckusick.com + * Berkeley, CA 94709-1608 +1-510-843-9542 * USA * * Redistribution and use in source and binary forms, with or without @@ -26,19 +22,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. None of the names of McKusick, Ganger, Patt, or the University of - * Michigan may be used to endorse or promote products derived from - * this software without specific prior written permission. - * 4. Redistributions in any form must be accompanied by information on - * how to obtain complete source code for any accompanying software - * that uses this software. This source code must either be included - * in the distribution or be available for no more than the cost of - * distribution plus a nominal fee, and must be freely redistributable - * under reasonable conditions. For an executable file, complete - * source code means the source code for all modules it contains. - * It does not mean source code for modules or files that typically - * accompany the operating system on which the executable file runs, - * e.g., standard library modules or system header files. * * THIS SOFTWARE IS PROVIDED BY MARSHALL KIRK MCKUSICK ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -52,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)softdep.h 9.6 (McKusick) 2/25/99 + * @(#)softdep.h 9.7 (McKusick) 6/21/00 * $FreeBSD$ */ |
