PERFORCE change 167326 for review
Aditya Sarawgi
truncs at FreeBSD.org
Fri Aug 14 14:35:16 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=167326
Change 167326 by truncs at aditya on 2009/08/14 14:35:08
Change license.
Affected files ...
.. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#32 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#17 edit
Differences ...
==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#32 (text+ko) ====
@@ -7,32 +7,31 @@
* $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_fs.h,v 1.17 2009/06/03 13:25:50 stas Exp $
*/
/*-
- * linux/include/linux/ext2_fs.h
+ * Copyright (c) 2009 Aditya Sarawgi
+ * All rights reserved.
*
- * Copyright (C) 1992, 1993, 1994, 1995
- * Remy Card (card at masi.ibp.fr)
- * Laboratoire MASI - Institut Blaise Pascal
- * Universite Pierre et Marie Curie (Paris VI)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 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.
*
- * from
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*
- * linux/include/linux/minix_fs.h
- *
- * Copyright (C) 1991, 1992 Linus Torvalds
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
+ *
*/
#ifndef _LINUX_EXT2_FS_H
==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#17 (text+ko) ====
@@ -36,24 +36,6 @@
* $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vfsops.c,v 1.183 2009/06/07 08:42:26 stas Exp $
*/
-/*-
- * COPYRIGHT.INFO says this has some GPL'd code from ext2_super.c in it
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
@@ -218,25 +200,11 @@
(fs->e2fs->e2fs_state & E2FS_ERRORS)) {
if (mp->mnt_flag & MNT_FORCE) {
printf(
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#34
- "dismounted\n", fs->fs_fsmnt);
-==== THEIRS //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#35
-"WARNING: %s was not properly dismounted\n", fs->fs_fsmnt);
-==== YOURS //aditya/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c
"WARNING: %s was not properly dismounted\n", fs->e2fs_fsmnt);
-<<<<
} else {
printf(
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#34
- "denied. Filesystem is not clean"
- " - run fsck\n", fs->fs_fsmnt);
-==== THEIRS //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#35
"WARNING: R/W mount of %s denied. Filesystem is not clean - run fsck\n",
- fs->fs_fsmnt);
-==== YOURS //aditya/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c
-"WARNING: R/W mount of %s denied. Filesystem is not clean - run fsck\n",
- fs->e2fs_fsmnt);
-<<<<
+ fs->e2fs_fsmnt);
return (EPERM);
}
}
@@ -322,18 +290,8 @@
devtoname(dev), es->e2fs_magic, E2FS_MAGIC);
return (1);
}
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#34
- if (es->s_rev_level > EXT2_GOOD_OLD_REV) {
- if (es->s_feature_incompat & ~EXT2_FEATURE_INCOMPAT_SUPP) {
- printf("WARNING: mount of %s denied due to unsupported "
- "optional features\n", devtoname(dev));
-==== THEIRS //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#35
- if (es->s_rev_level > EXT2_GOOD_OLD_REV) {
- if (es->s_feature_incompat & ~EXT2_FEATURE_INCOMPAT_SUPP) {
-==== YOURS //aditya/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c
if (es->e2fs_rev > E2FS_REV0) {
if (es->e2fs_features_incompat & ~EXT2F_INCOMPAT_SUPP) {
-<<<<
printf(
"WARNING: mount of %s denied due to unsupported optional features\n",
devtoname(dev));
More information about the p4-projects
mailing list