PERFORCE change 168108 for review

Aditya Sarawgi truncs at FreeBSD.org
Thu Sep 3 15:33:25 UTC 2009 

http://perforce.freebsd.org/chv.cgi?CH=168108

Change 168108 by truncs at aditya on 2009/09/03 15:33:20

	Cleanup.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#4 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bmap.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dinode.h#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dir.h#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_extern.h#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_fs.h#4 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode.c#5 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode_cnv.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_mount.h#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_readwrite.c#3 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_subr.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#3 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vnops.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#2 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#4 (text+ko) ====

@@ -45,11 +45,11 @@
 #include <sys/syslog.h>
 #include <sys/buf.h>
 
-#include <gnu/fs/ext2fs/inode.h>
-#include <gnu/fs/ext2fs/ext2_mount.h>
-#include <gnu/fs/ext2fs/ext2_fs.h>
-#include <gnu/fs/ext2fs/fs.h>
-#include <gnu/fs/ext2fs/ext2_extern.h>
+#include <fs/ext2fs/inode.h>
+#include <fs/ext2fs/ext2_mount.h>
+#include <fs/ext2fs/ext2_fs.h>
+#include <fs/ext2fs/fs.h>
+#include <fs/ext2fs/ext2_extern.h>
 
 static daddr_t	ext2_alloccg(struct inode *, int, daddr_t, int);
 static u_long	ext2_dirpref(struct m_ext2fs *);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#2 (text+ko) ====

@@ -44,10 +44,10 @@
 #include <sys/ucred.h>
 #include <sys/vnode.h>
 
-#include <gnu/fs/ext2fs/inode.h>
-#include <gnu/fs/ext2fs/ext2_fs.h>
-#include <gnu/fs/ext2fs/fs.h>
-#include <gnu/fs/ext2fs/ext2_extern.h>
+#include <fs/ext2fs/inode.h>
+#include <fs/ext2fs/ext2_fs.h>
+#include <fs/ext2fs/fs.h>
+#include <fs/ext2fs/ext2_extern.h>
 
 /*
  * Balloc defines the structure of file system storage
@@ -70,10 +70,7 @@
 	struct indir indirs[NIADDR + 2];
 	int32_t newb, lbn, *bap, pref;
 	int osize, nsize, num, i, error;
-/*
-ext2_debug("ext2_balloc called (%d, %d, %d)\n", 
-	ip->i_number, (int)bn, (int)size);
-*/
+
 	*bpp = NULL;
 	if (bn < 0)
 		return (EFBIG);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bmap.c#2 (text+ko) ====

@@ -45,10 +45,10 @@
 #include <sys/resourcevar.h>
 #include <sys/stat.h>
 
-#include <gnu/fs/ext2fs/inode.h>
-#include <gnu/fs/ext2fs/ext2_fs.h>
-#include <gnu/fs/ext2fs/ext2_mount.h>
-#include <gnu/fs/ext2fs/ext2_extern.h>
+#include <fs/ext2fs/inode.h>
+#include <fs/ext2fs/ext2_fs.h>
+#include <fs/ext2fs/ext2_mount.h>
+#include <fs/ext2fs/ext2_extern.h>
 
 /*
  * Bmap converts a the logical block number of a file to its physical block

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dinode.h#2 (text+ko) ====

@@ -26,8 +26,8 @@
  * 
  */
 
-#ifndef _SYS_GNU_EXT2FS_EXT2_DINODE_H_
-#define _SYS_GNU_EXT2FS_EXT2_DINODE_H_
+#ifndef _FS_EXT2FS_EXT2_DINODE_H_
+#define _FS_EXT2FS_EXT2_DINODE_H_
 
 #define e2di_size_high	e2di_dacl
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dir.h#2 (text+ko) ====

@@ -26,8 +26,8 @@
  * 
  */
 
-#ifndef _SYS_GNU_EXT2FS_EXT2_DIR_H_
-#define _SYS_GNU_EXT2FS_EXT2_DIR_H_
+#ifndef _FS_EXT2FS_EXT2_DIR_H_
+#define _FS_EXT2FS_EXT2_DIR_H_
 
 /*
  * Structure of a directory entry

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_extern.h#2 (text+ko) ====

@@ -36,8 +36,8 @@
  * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_extern.h,v 1.35 2005/03/14 13:30:05 phk Exp $
  */
 
-#ifndef _SYS_GNU_EXT2FS_EXT2_EXTERN_H_
-#define	_SYS_GNU_EXT2FS_EXT2_EXTERN_H_
+#ifndef _FS_EXT2FS_EXT2_EXTERN_H_
+#define	_FS_EXT2FS_EXT2_EXTERN_H_
 
 struct ext2fs_dinode;
 struct indir;

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_fs.h#4 (text+ko) ====

@@ -34,8 +34,8 @@
  * 
  */
 
-#ifndef _LINUX_EXT2_FS_H
-#define _LINUX_EXT2_FS_H
+#ifndef _FS_EXT2FS_EXT2_FS_H
+#define _FS_EXT2FS_EXT2_FS_H
 
 #include <sys/types.h>
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode.c#5 (text+ko) ====

@@ -47,11 +47,11 @@
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 
-#include <gnu/fs/ext2fs/inode.h>
-#include <gnu/fs/ext2fs/ext2_mount.h>
-#include <gnu/fs/ext2fs/ext2_fs.h>
-#include <gnu/fs/ext2fs/fs.h>
-#include <gnu/fs/ext2fs/ext2_extern.h>
+#include <fs/ext2fs/inode.h>
+#include <fs/ext2fs/ext2_mount.h>
+#include <fs/ext2fs/ext2_fs.h>
+#include <fs/ext2fs/fs.h>
+#include <fs/ext2fs/ext2_extern.h>
 
 static int ext2_indirtrunc(struct inode *, int32_t, int32_t, int32_t, int,
 	    long *);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode_cnv.c#2 (text+ko) ====

@@ -31,10 +31,10 @@
 #include <sys/stat.h>
 #include <sys/vnode.h>
 
-#include <gnu/fs/ext2fs/inode.h>
-#include <gnu/fs/ext2fs/ext2_fs.h>
-#include <gnu/fs/ext2fs/ext2_extern.h>
-#include <gnu/fs/ext2fs/ext2_dinode.h>
+#include <fs/ext2fs/inode.h>
+#include <fs/ext2fs/ext2_fs.h>
+#include <fs/ext2fs/ext2_extern.h>
+#include <fs/ext2fs/ext2_dinode.h>
 
 void
 ext2_print_inode( in )

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#2 (text+ko) ====

@@ -55,11 +55,11 @@
 
 #include <ufs/ufs/dir.h>
 
-#include <gnu/fs/ext2fs/inode.h>
-#include <gnu/fs/ext2fs/ext2_mount.h>
-#include <gnu/fs/ext2fs/ext2_extern.h>
-#include <gnu/fs/ext2fs/ext2_fs.h>
-#include <gnu/fs/ext2fs/ext2_dir.h>
+#include <fs/ext2fs/inode.h>
+#include <fs/ext2fs/ext2_mount.h>
+#include <fs/ext2fs/ext2_extern.h>
+#include <fs/ext2fs/ext2_fs.h>
+#include <fs/ext2fs/ext2_dir.h>
 
 #ifdef DIAGNOSTIC
 static int dirchk = 1;

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_mount.h#2 (text+ko) ====

@@ -30,8 +30,8 @@
  * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_mount.h,v 1.31 2005/01/06 18:27:30 imp Exp $
  */
 
-#ifndef _SYS_GNU_EXT2FS_EXT2_MOUNT_H_
-#define _SYS_GNU_EXT2FS_EXT2_MOUNT_H_
+#ifndef _FS_EXT2FS_EXT2_MOUNT_H_
+#define _FS_EXT2FS_EXT2_MOUNT_H_
 
 #ifdef _KERNEL
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_readwrite.c#3 (text+ko) ====


==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_subr.c#2 (text+ko) ====

@@ -46,10 +46,10 @@
 #include <sys/ucred.h>
 #include <sys/vnode.h>
 
-#include <gnu/fs/ext2fs/inode.h>
-#include <gnu/fs/ext2fs/ext2_extern.h>
-#include <gnu/fs/ext2fs/ext2_fs.h>
-#include <gnu/fs/ext2fs/fs.h>
+#include <fs/ext2fs/inode.h>
+#include <fs/ext2fs/ext2_extern.h>
+#include <fs/ext2fs/ext2_fs.h>
+#include <fs/ext2fs/fs.h>
 
 #ifdef KDB
 void	ext2_checkoverlap(struct buf *, struct inode *);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#3 (text+ko) ====

@@ -55,12 +55,12 @@
 #include <geom/geom.h>
 #include <geom/geom_vfs.h>
 
-#include <gnu/fs/ext2fs/ext2_mount.h>
-#include <gnu/fs/ext2fs/inode.h>
+#include <fs/ext2fs/ext2_mount.h>
+#include <fs/ext2fs/inode.h>
 
-#include <gnu/fs/ext2fs/fs.h>
-#include <gnu/fs/ext2fs/ext2_extern.h>
-#include <gnu/fs/ext2fs/ext2_fs.h>
+#include <fs/ext2fs/fs.h>
+#include <fs/ext2fs/ext2_extern.h>
+#include <fs/ext2fs/ext2_fs.h>
 
 static int	ext2_flushfiles(struct mount *mp, int flags, struct thread *td);
 static int	ext2_mountfs(struct vnode *, struct mount *);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vnops.c#2 (text+ko) ====

@@ -74,12 +74,12 @@
 #include <sys/signalvar.h>
 #include <ufs/ufs/dir.h>
 
-#include <gnu/fs/ext2fs/inode.h>
-#include <gnu/fs/ext2fs/ext2_mount.h>
-#include <gnu/fs/ext2fs/fs.h>
-#include <gnu/fs/ext2fs/ext2_extern.h>
-#include <gnu/fs/ext2fs/ext2_fs.h>
-#include <gnu/fs/ext2fs/ext2_dir.h>
+#include <fs/ext2fs/inode.h>
+#include <fs/ext2fs/ext2_mount.h>
+#include <fs/ext2fs/fs.h>
+#include <fs/ext2fs/ext2_extern.h>
+#include <fs/ext2fs/ext2_fs.h>
+#include <fs/ext2fs/ext2_dir.h>
 
 static int ext2_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *);
 
@@ -160,7 +160,7 @@
 	.vop_vptofh =		ext2_vptofh,
 };
 
-#include <gnu/fs/ext2fs/ext2_readwrite.c>
+#include <fs/ext2fs/ext2_readwrite.c>
 
 /*
  * A virgin directory (no blushing please).

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#2 (text+ko) ====


==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#2 (text+ko) ====

@@ -35,8 +35,8 @@
  * $FreeBSD: src/sys/gnu/fs/ext2fs/inode.h,v 1.45 2008/04/16 11:33:30 kib Exp $
  */
 
-#ifndef _SYS_GNU_EXT2FS_INODE_H_
-#define	_SYS_GNU_EXT2FS_INODE_H_
+#ifndef _FS_EXT2FS_INODE_H_
+#define	_FS_EXT2FS_INODE_H_
 
 #include <sys/lock.h>
 #include <sys/queue.h>

More information about the p4-projects mailing list