CVS commit: src/sys/ufs/chfs

2012-10-19 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Fri Oct 19 12:44:40 UTC 2012

Modified Files:
src/sys/ufs/chfs: chfs.h chfs_args.h chfs_build.c chfs_erase.c
chfs_gc.c chfs_ihash.c chfs_inode.h chfs_malloc.c chfs_nodeops.c
chfs_readinode.c chfs_scan.c chfs_subr.c chfs_vfsops.c chfs_vnode.c
chfs_vnode_cache.c chfs_vnops.c chfs_wbuf.c chfs_write.c ebh.h
ebh_misc.h media.h

Log Message:
CHFS comments


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/ufs/chfs/chfs.h src/sys/ufs/chfs/chfs_subr.c \
src/sys/ufs/chfs/chfs_vnode.c
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/chfs/chfs_args.h \
src/sys/ufs/chfs/chfs_erase.c src/sys/ufs/chfs/chfs_ihash.c \
src/sys/ufs/chfs/ebh_misc.h src/sys/ufs/chfs/media.h
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs_build.c \
src/sys/ufs/chfs/chfs_wbuf.c src/sys/ufs/chfs/chfs_write.c
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/chfs/chfs_gc.c \
src/sys/ufs/chfs/chfs_malloc.c src/sys/ufs/chfs/chfs_scan.c
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/chfs/chfs_inode.h \
src/sys/ufs/chfs/chfs_readinode.c src/sys/ufs/chfs/chfs_vfsops.c
cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/chfs/chfs_nodeops.c \
src/sys/ufs/chfs/chfs_vnode_cache.c src/sys/ufs/chfs/ebh.h
cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/chfs/chfs_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/ufs/chfs

2012-08-23 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Thu Aug 23 11:29:52 UTC 2012

Modified Files:
src/sys/ufs/chfs: chfs_vnops.c

Log Message:
chfs: uappnd flag patch


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/chfs/chfs_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/ufs/chfs/chfs_vnops.c
diff -u src/sys/ufs/chfs/chfs_vnops.c:1.9 src/sys/ufs/chfs/chfs_vnops.c:1.10
--- src/sys/ufs/chfs/chfs_vnops.c:1.9	Fri Aug 10 09:26:58 2012
+++ src/sys/ufs/chfs/chfs_vnops.c	Thu Aug 23 11:29:51 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs_vnops.c,v 1.9 2012/08/10 09:26:58 ttoth Exp $	*/
+/*	$NetBSD: chfs_vnops.c,v 1.10 2012/08/23 11:29:51 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -467,17 +467,33 @@ chfs_setattr(void *v)
 		return EINVAL;
 	}
 
-	if (error == 0  (vap-va_flags != VNOVAL))
+	if (error == 0  (vap-va_flags != VNOVAL)) {
 		error = chfs_chflags(vp, vap-va_flags, cred);
+		return error;
+	}
+
+	if (ip-flags  (IMMUTABLE | APPEND)) {
+		error = EPERM;
+		return error;
+	}
 
-	if (error == 0  (vap-va_size != VNOVAL))
+	if (error == 0  (vap-va_size != VNOVAL)) {
 		error = chfs_chsize(vp, vap-va_size, cred);
+		if (error)
+			return error;
+	}
 
-	if (error == 0  (vap-va_uid != VNOVAL || vap-va_gid != VNOVAL))
+	if (error == 0  (vap-va_uid != VNOVAL || vap-va_gid != VNOVAL)) {
 		error = chfs_chown(vp, vap-va_uid, vap-va_gid, cred);
+		if (error)
+			return error;
+	}
 
-	if (error == 0  (vap-va_mode != VNOVAL))
+	if (error == 0  (vap-va_mode != VNOVAL)) {
 		error = chfs_chmod(vp, vap-va_mode, cred);
+		if (error)
+			return error;
+	}
 
 #if 0
 	/* why do we need that? */
@@ -1054,11 +1070,18 @@ chfs_remove(void *v)
 	struct chfs_inode *parent = VTOI(dvp);
 	int error = 0;
 
+	if (vp-v_type == VDIR || (ip-flags  (IMMUTABLE | APPEND)) ||
+		(parent-flags  APPEND)) {
+		error = EPERM;
+		goto out;
+	}
+
 	KASSERT(ip-chvc-vno != ip-chvc-pvno);
 
 	error = chfs_do_unlink(ip,
 	parent, cnp-cn_nameptr, cnp-cn_namelen);
 
+out:
 	vput(dvp);
 	vput(vp);

CVS commit: src/sys/ufs/chfs

2012-08-23 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Thu Aug 23 11:29:52 UTC 2012

Modified Files:
src/sys/ufs/chfs: chfs_vnops.c

Log Message:
chfs: uappnd flag patch


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/chfs/chfs_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/ufs/chfs

2012-08-22 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Wed Aug 22 09:20:13 UTC 2012

Modified Files:
src/sys/ufs/chfs: chfs_readinode.c chfs_subr.c

Log Message:
chfs: fixed truncating


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs_readinode.c
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/chfs/chfs_subr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/ufs/chfs/chfs_readinode.c
diff -u src/sys/ufs/chfs/chfs_readinode.c:1.4 src/sys/ufs/chfs/chfs_readinode.c:1.5
--- src/sys/ufs/chfs/chfs_readinode.c:1.4	Mon Aug 13 13:12:51 2012
+++ src/sys/ufs/chfs/chfs_readinode.c	Wed Aug 22 09:20:13 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs_readinode.c,v 1.4 2012/08/13 13:12:51 ttoth Exp $	*/
+/*	$NetBSD: chfs_readinode.c,v 1.5 2012/08/22 09:20:13 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -604,6 +604,10 @@ chfs_remove_frags_of_node(struct chfs_mo
 	KASSERT(mutex_owned(chmp-chm_lock_mountfields));
 	struct chfs_node_frag *this, *next;
 
+	if (nref == NULL) {
+		return;
+	}
+
 	this = (struct chfs_node_frag *)RB_TREE_MIN(fragtree);
 	while (this) {
 		next = frag_next(fragtree, this);
@@ -1086,6 +1090,7 @@ chfs_read_data(struct chfs_mount* chmp, 
 	frag = (struct chfs_node_frag *)rb_tree_find_node_leq(ip-fragtree, ofs);
 
 	if (!frag || frag-ofs  ofs || frag-ofs + frag-size = ofs) {
+		bp-b_resid = 0;
 		dbg(not found in frag tree\n);
 		return 0;
 	}

Index: src/sys/ufs/chfs/chfs_subr.c
diff -u src/sys/ufs/chfs/chfs_subr.c:1.6 src/sys/ufs/chfs/chfs_subr.c:1.7
--- src/sys/ufs/chfs/chfs_subr.c:1.6	Mon Aug 13 13:12:51 2012
+++ src/sys/ufs/chfs/chfs_subr.c	Wed Aug 22 09:20:13 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs_subr.c,v 1.6 2012/08/13 13:12:51 ttoth Exp $	*/
+/*	$NetBSD: chfs_subr.c,v 1.7 2012/08/22 09:20:13 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -216,11 +216,6 @@ chfs_chsize(struct vnode *vp, u_quad_t s
 {
 	struct chfs_mount *chmp;
 	struct chfs_inode *ip;
-	struct buf *bp;
-	int blknum, append;
-	int error = 0;
-	char *buf = NULL;
-	struct chfs_full_dnode *fd;
 
 	ip = VTOI(vp);
 	chmp = ip-chmp;
@@ -246,104 +241,25 @@ chfs_chsize(struct vnode *vp, u_quad_t s
 	vflushbuf(vp, 0);
 
 	mutex_enter(chmp-chm_lock_mountfields);
-	chfs_flush_pending_wbuf(chmp);
 
-	/* handle truncate to zero as a special case */
-	if (size == 0) {
-		dbg(truncate to zero);
-		chfs_truncate_fragtree(ip-chmp,
-		ip-fragtree, size);
+	if (ip-size  size) {
+		uvm_vnp_setsize(vp, size);
 		chfs_set_vnode_size(vp, size);
+		ip-iflag |= IN_CHANGE | IN_UPDATE;
 
 		mutex_exit(chmp-chm_lock_mountfields);
-
 		return 0;
 	}
 
-
-	/* allocate zeros for the new data */
-	buf = kmem_zalloc(size, KM_SLEEP);
-	bp = getiobuf(vp, true);
-
-	if (ip-size != 0) {
-		/* read the whole data */
-		bp-b_blkno = 0;
-		bp-b_bufsize = bp-b_resid = bp-b_bcount = ip-size;
-		bp-b_data = kmem_alloc(ip-size, KM_SLEEP);
-
-		error = chfs_read_data(chmp, vp, bp);
-		if (error) {
-			mutex_exit(chmp-chm_lock_mountfields);
-			putiobuf(bp);
-
-			return error;
-		}
-
-		/* create the new data */
-		dbg(create new data vap%llu ip%llu\n,
-			(unsigned long long)size, (unsigned long long)ip-size);
-		append = size - ip-size;
-		if (append  0) {
-			memcpy(buf, bp-b_data, ip-size);
-		} else {
-			memcpy(buf, bp-b_data, size);
-			chfs_truncate_fragtree(ip-chmp,
-ip-fragtree, size);
-		}
-
-		kmem_free(bp-b_data, ip-size);
-
-		struct chfs_node_frag *lastfrag = frag_last(ip-fragtree);
-		fd = lastfrag-node;
-
-		// remove from the list
-		mutex_enter(chmp-chm_lock_vnocache);
-		chfs_remove_frags_of_node(chmp, ip-fragtree, fd-nref);
-		// don't obsolete here, because setattr will obsolete this node
-		chfs_remove_node_from_list(chmp, ip-chvc, fd-nref, ip-chvc-dnode);
-		mutex_exit(chmp-chm_lock_vnocache);
-
-		blknum = lastfrag-ofs / PAGE_SIZE;
-		lastfrag-size = append  PAGE_SIZE ? PAGE_SIZE : size % PAGE_SIZE;
-	} else {
-		fd = chfs_alloc_full_dnode();
-		blknum = 0;
+	if (size != 0) {
+		ubc_zerorange(vp-v_uobj, size, ip-size - size, UBC_UNMAP_FLAG(vp));
 	}
-
+	
+	chfs_truncate_fragtree(ip-chmp, ip-fragtree, size);
+	uvm_vnp_setsize(vp, size);
 	chfs_set_vnode_size(vp, size);
-
-	// write the new data
-	for (bp-b_blkno = blknum; bp-b_blkno * PAGE_SIZE  size; bp-b_blkno++) {
-		uint64_t writesize = MIN(size - bp-b_blkno * PAGE_SIZE, PAGE_SIZE);
-
-		bp-b_bufsize = bp-b_resid = bp-b_bcount = writesize;
-		bp-b_data = kmem_alloc(writesize, KM_SLEEP);
-
-		memcpy(bp-b_data, buf + (bp-b_blkno * PAGE_SIZE), writesize);
-
-		if (bp-b_blkno != blknum) {
-			fd = chfs_alloc_full_dnode();
-		}
-
-		error = chfs_write_flash_dnode(chmp, vp, bp, fd);
-		if (error) {
-			mutex_exit(chmp-chm_lock_mountfields);
-			kmem_free(bp-b_data, writesize);
-			putiobuf(bp);
-
-			return error;
-		}
-		if (bp-b_blkno != blknum) {
-			chfs_add_full_dnode_to_inode(chmp, ip, fd);
-

CVS commit: src/sys/ufs/chfs

2012-08-22 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Wed Aug 22 09:20:13 UTC 2012

Modified Files:
src/sys/ufs/chfs: chfs_readinode.c chfs_subr.c

Log Message:
chfs: fixed truncating


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs_readinode.c
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/chfs/chfs_subr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/ufs/chfs

2012-08-13 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Mon Aug 13 13:12:51 UTC 2012

Modified Files:
src/sys/ufs/chfs: chfs_readinode.c chfs_subr.c chfs_vnode.c

Log Message:
chfs fixes
1. nodes are obsoleted only once during truncating a file
2. frags don't stay in pool_cache


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/chfs/chfs_readinode.c
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/chfs/chfs_subr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/chfs/chfs_vnode.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/ufs/chfs/chfs_readinode.c
diff -u src/sys/ufs/chfs/chfs_readinode.c:1.3 src/sys/ufs/chfs/chfs_readinode.c:1.4
--- src/sys/ufs/chfs/chfs_readinode.c:1.3	Fri Aug 10 09:26:58 2012
+++ src/sys/ufs/chfs/chfs_readinode.c	Mon Aug 13 13:12:51 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs_readinode.c,v 1.3 2012/08/10 09:26:58 ttoth Exp $	*/
+/*	$NetBSD: chfs_readinode.c,v 1.4 2012/08/13 13:12:51 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -609,6 +609,7 @@ chfs_remove_frags_of_node(struct chfs_mo
 		next = frag_next(fragtree, this);
 		if (this-node-nref == nref) {
 			rb_tree_remove_node(fragtree, this);
+			chfs_free_node_frag(this);
 		}
 		this = next;
 	}

Index: src/sys/ufs/chfs/chfs_subr.c
diff -u src/sys/ufs/chfs/chfs_subr.c:1.5 src/sys/ufs/chfs/chfs_subr.c:1.6
--- src/sys/ufs/chfs/chfs_subr.c:1.5	Fri Aug 10 09:26:58 2012
+++ src/sys/ufs/chfs/chfs_subr.c	Mon Aug 13 13:12:51 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs_subr.c,v 1.5 2012/08/10 09:26:58 ttoth Exp $	*/
+/*	$NetBSD: chfs_subr.c,v 1.6 2012/08/13 13:12:51 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -299,7 +299,8 @@ chfs_chsize(struct vnode *vp, u_quad_t s
 		// remove from the list
 		mutex_enter(chmp-chm_lock_vnocache);
 		chfs_remove_frags_of_node(chmp, ip-fragtree, fd-nref);
-		chfs_remove_and_obsolete(chmp, ip-chvc, fd-nref, ip-chvc-dnode);
+		// don't obsolete here, because setattr will obsolete this node
+		chfs_remove_node_from_list(chmp, ip-chvc, fd-nref, ip-chvc-dnode);
 		mutex_exit(chmp-chm_lock_vnocache);
 
 		blknum = lastfrag-ofs / PAGE_SIZE;

Index: src/sys/ufs/chfs/chfs_vnode.c
diff -u src/sys/ufs/chfs/chfs_vnode.c:1.6 src/sys/ufs/chfs/chfs_vnode.c:1.7
--- src/sys/ufs/chfs/chfs_vnode.c:1.6	Fri Aug 10 09:26:58 2012
+++ src/sys/ufs/chfs/chfs_vnode.c	Mon Aug 13 13:12:51 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs_vnode.c,v 1.6 2012/08/10 09:26:58 ttoth Exp $	*/
+/*	$NetBSD: chfs_vnode.c,v 1.7 2012/08/13 13:12:51 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -83,7 +83,7 @@ chfs_readvnode(struct mount* mp, ino_t i
 
 	if (chvc  ino != CHFS_ROOTINO) {
 		/* debug... */
-		printf(readvnode; offset: % PRIu32 , lnr: %d\n,
+		dbg(offset: % PRIu32 , lnr: %d\n,
 		CHFS_GET_OFS(chvc-v-nref_offset), chvc-v-nref_lnr);
 
 		KASSERT((void *)chvc != (void *)chvc-v);

CVS commit: src/sys/ufs/chfs

2012-08-13 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Mon Aug 13 13:12:51 UTC 2012

Modified Files:
src/sys/ufs/chfs: chfs_readinode.c chfs_subr.c chfs_vnode.c

Log Message:
chfs fixes
1. nodes are obsoleted only once during truncating a file
2. frags don't stay in pool_cache


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/chfs/chfs_readinode.c
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/chfs/chfs_subr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/chfs/chfs_vnode.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/ufs/chfs

2012-08-10 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Fri Aug 10 09:26:58 UTC 2012

Modified Files:
src/sys/ufs/chfs: chfs.h chfs_build.c chfs_gc.c chfs_malloc.c
chfs_nodeops.c chfs_readinode.c chfs_scan.c chfs_subr.c
chfs_vfsops.c chfs_vnode.c chfs_vnode_cache.c chfs_vnops.c
chfs_write.c ebh.c

Log Message:
chfs bugfix [node was obsoleted twice]


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/chfs/chfs.h
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/chfs/chfs_build.c \
src/sys/ufs/chfs/chfs_write.c
cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/chfs/chfs_gc.c \
src/sys/ufs/chfs/chfs_malloc.c src/sys/ufs/chfs/chfs_readinode.c \
src/sys/ufs/chfs/chfs_scan.c src/sys/ufs/chfs/ebh.c
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/chfs/chfs_nodeops.c \
src/sys/ufs/chfs/chfs_vnode_cache.c
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs_subr.c \
src/sys/ufs/chfs/chfs_vfsops.c
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/chfs/chfs_vnode.c
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/chfs/chfs_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/ufs/chfs/chfs.h
diff -u src/sys/ufs/chfs/chfs.h:1.6 src/sys/ufs/chfs/chfs.h:1.7
--- src/sys/ufs/chfs/chfs.h:1.6	Fri Apr 13 14:50:35 2012
+++ src/sys/ufs/chfs/chfs.h	Fri Aug 10 09:26:58 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs.h,v 1.6 2012/04/13 14:50:35 ttoth Exp $	*/
+/*	$NetBSD: chfs.h,v 1.7 2012/08/10 09:26:58 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -494,6 +494,10 @@ int chfs_update_eb_dirty(struct chfs_mou
 struct chfs_eraseblock *, uint32_t);
 void chfs_add_node_to_list(struct chfs_mount *, struct chfs_vnode_cache *,
 struct chfs_node_ref *, struct chfs_node_ref **);
+void chfs_remove_node_from_list(struct chfs_mount *, struct chfs_vnode_cache *,
+struct chfs_node_ref *, struct chfs_node_ref **);
+void chfs_remove_and_obsolete(struct chfs_mount *, struct chfs_vnode_cache *,
+struct chfs_node_ref *, struct chfs_node_ref **);
 void chfs_add_fd_to_inode(struct chfs_mount *,
 struct chfs_inode *, struct chfs_dirent *);
 void chfs_add_vnode_ref_to_vc(struct chfs_mount *, struct chfs_vnode_cache *,
@@ -522,7 +526,6 @@ chfs_nref_to_vc(struct chfs_node_ref *nr
 			dbg(Empty!\n);
 		}
 	}
-	//dbg(vno: %llu\n, ((struct chfs_vnode_cache *)(nref))-vno);
 
 	//dbg(NREF_TO_VC: GET IT\n);
 	//dbg(nref_next: %p, lnr: %u, ofs: %u\n, nref-nref_next, nref-nref_lnr, nref-nref_offset);
@@ -564,7 +567,9 @@ void chfs_free_tmp_dnode_info(struct chf
 /* chfs_readinode.c */
 int chfs_read_inode(struct chfs_mount *, struct chfs_inode *);
 int chfs_read_inode_internal(struct chfs_mount *, struct chfs_inode *);
-void chfs_kill_fragtree(struct rb_tree *);
+void chfs_remove_frags_of_node(struct chfs_mount *, struct rb_tree *,
+	struct chfs_node_ref *);
+void chfs_kill_fragtree(struct chfs_mount *, struct rb_tree *);
 uint32_t chfs_truncate_fragtree(struct chfs_mount *,
 	struct rb_tree *, uint32_t);
 int chfs_add_full_dnode_to_inode(struct chfs_mount *,
@@ -653,8 +658,6 @@ void chfs_change_size_wasted(struct chfs
 /* chfs_vnode_cache.c */
 struct chfs_vnode_cache **chfs_vnocache_hash_init(void);
 void chfs_vnocache_hash_destroy(struct chfs_vnode_cache **);
-void chfs_vnode_cache_set_state(struct chfs_mount *,
-struct chfs_vnode_cache *, int);
 struct chfs_vnode_cache* chfs_vnode_cache_get(struct chfs_mount *, ino_t);
 void chfs_vnode_cache_add(struct chfs_mount *, struct chfs_vnode_cache *);
 void chfs_vnode_cache_remove(struct chfs_mount *, struct chfs_vnode_cache *);

Index: src/sys/ufs/chfs/chfs_build.c
diff -u src/sys/ufs/chfs/chfs_build.c:1.3 src/sys/ufs/chfs/chfs_build.c:1.4
--- src/sys/ufs/chfs/chfs_build.c:1.3	Thu Apr 12 15:31:01 2012
+++ src/sys/ufs/chfs/chfs_build.c	Fri Aug 10 09:26:58 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs_build.c,v 1.3 2012/04/12 15:31:01 ttoth Exp $	*/
+/*	$NetBSD: chfs_build.c,v 1.4 2012/08/10 09:26:58 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -67,11 +67,11 @@ void
 chfs_build_set_vnodecache_nlink(struct chfs_mount *chmp,
 struct chfs_vnode_cache *vc)
 {
-	struct chfs_dirent *fd;
+	struct chfs_dirent *fd, *tmpfd;
 	//dbg(set nlink\n);
 
 //	for (fd = vc-scan_dirents; fd; fd = fd-next) {
-	TAILQ_FOREACH(fd, vc-scan_dirents, fds) {
+	TAILQ_FOREACH_SAFE(fd, vc-scan_dirents, fds, tmpfd) {
 		struct chfs_vnode_cache *child_vc;
 
 		if (!fd-vno)
@@ -82,6 +82,7 @@ chfs_build_set_vnodecache_nlink(struct c
 		mutex_exit(chmp-chm_lock_vnocache);
 		if (!child_vc) {
 			chfs_mark_node_obsolete(chmp, fd-nref);
+			TAILQ_REMOVE(vc-scan_dirents, fd, fds);
 			continue;
 		}
 		if (fd-type == CHT_DIR) {
@@ -122,8 +123,8 @@ chfs_build_remove_unlinked_vnode(struct 
 	dbg(START\n);
 	dbg(vno: %llu\n, (unsigned long long)vc-vno);
 
-	nref = vc-dnode;
 	KASSERT(mutex_owned(chmp-chm_lock_mountfields));
+	nref = vc-dnode;
 	// The

CVS commit: src/sys/ufs/chfs

2012-08-10 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Fri Aug 10 09:26:58 UTC 2012

Modified Files:
src/sys/ufs/chfs: chfs.h chfs_build.c chfs_gc.c chfs_malloc.c
chfs_nodeops.c chfs_readinode.c chfs_scan.c chfs_subr.c
chfs_vfsops.c chfs_vnode.c chfs_vnode_cache.c chfs_vnops.c
chfs_write.c ebh.c

Log Message:
chfs bugfix [node was obsoleted twice]


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/chfs/chfs.h
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/chfs/chfs_build.c \
src/sys/ufs/chfs/chfs_write.c
cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/chfs/chfs_gc.c \
src/sys/ufs/chfs/chfs_malloc.c src/sys/ufs/chfs/chfs_readinode.c \
src/sys/ufs/chfs/chfs_scan.c src/sys/ufs/chfs/ebh.c
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/chfs/chfs_nodeops.c \
src/sys/ufs/chfs/chfs_vnode_cache.c
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs_subr.c \
src/sys/ufs/chfs/chfs_vfsops.c
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/chfs/chfs_vnode.c
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/chfs/chfs_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.sbin/makefs

2012-04-19 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Thu Apr 19 15:36:06 UTC 2012

Modified Files:
src/usr.sbin/makefs: Makefile makefs.8 makefs.c makefs.h
Added Files:
src/usr.sbin/makefs: chfs.c chfs_makefs.h
src/usr.sbin/makefs/chfs: Makefile.inc chfs_mkfs.c chfs_mkfs.h

Log Message:
added chfs support for makefs


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/makefs/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.sbin/makefs/chfs.c \
src/usr.sbin/makefs/chfs_makefs.h
cvs rdiff -u -r1.38 -r1.39 src/usr.sbin/makefs/makefs.8
cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/makefs/makefs.c
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/makefs/makefs.h
cvs rdiff -u -r0 -r1.1 src/usr.sbin/makefs/chfs/Makefile.inc \
src/usr.sbin/makefs/chfs/chfs_mkfs.c src/usr.sbin/makefs/chfs/chfs_mkfs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/makefs/Makefile
diff -u src/usr.sbin/makefs/Makefile:1.29 src/usr.sbin/makefs/Makefile:1.30
--- src/usr.sbin/makefs/Makefile:1.29	Mon Jul 18 22:52:37 2011
+++ src/usr.sbin/makefs/Makefile	Thu Apr 19 15:36:06 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.29 2011/07/18 22:52:37 tron Exp $
+#	$NetBSD: Makefile,v 1.30 2012/04/19 15:36:06 ttoth Exp $
 #
 
 WARNS?=	3	# XXX -Wsign-compare
@@ -6,7 +6,7 @@ WARNS?=	3	# XXX -Wsign-compare
 .include bsd.own.mk
 
 PROG=	makefs
-SRCS=	cd9660.c ffs.c v7fs.c \
+SRCS=	cd9660.c chfs.c ffs.c v7fs.c \
 	getid.c \
 	makefs.c misc.c \
 	pack_dev.c \
@@ -21,6 +21,7 @@ CPPFLAGS+=	-I${.CURDIR} -I${MKNODSRC} -I
 .PATH:		${MKNODSRC} ${MTREESRC}
 
 .include ${.CURDIR}/cd9660/Makefile.inc
+.include ${.CURDIR}/chfs/Makefile.inc
 .include ${.CURDIR}/ffs/Makefile.inc
 .include ${.CURDIR}/v7fs/Makefile.inc
 

Index: src/usr.sbin/makefs/makefs.8
diff -u src/usr.sbin/makefs/makefs.8:1.38 src/usr.sbin/makefs/makefs.8:1.39
--- src/usr.sbin/makefs/makefs.8:1.38	Sat Jan 28 02:35:46 2012
+++ src/usr.sbin/makefs/makefs.8	Thu Apr 19 15:36:06 2012
@@ -1,4 +1,4 @@
-.\	$NetBSD: makefs.8,v 1.38 2012/01/28 02:35:46 christos Exp $
+.\	$NetBSD: makefs.8,v 1.39 2012/04/19 15:36:06 ttoth Exp $
 .\
 .\ Copyright (c) 2001-2003 Wasabi Systems, Inc.
 .\ All rights reserved.
@@ -33,7 +33,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd January 27, 2012
+.Dd April 5, 2012
 .Dt MAKEFS 8
 .Os
 .Sh NAME
@@ -199,6 +199,8 @@ The following file system types are supp
 BSD fast file system (default).
 .It Sy cd9660
 ISO 9660 file system.
+.It Sy chfs
+Chip flash file system.
 .It Sy v7fs
 7th Edition(V7) file system.
 .El
@@ -339,6 +341,22 @@ Use RockRidge extensions (for longer fil
 .It Sy volumeid
 Volume set identifier of the image.
 .El
+.Ss CHFS-specific options
+.Sy chfs
+images have chfs-specific optional parameters that may be provided.
+Each of the options consists of a keyword, an equal sign
+.Pq Ql = ,
+and a value.
+The following keywords are supported:
+.Pp
+.Bl -tag -width optimization -offset indent -compact
+.It Sy pagesize
+Pagesize.
+.It Sy erasesize
+Erase block size of the media.
+.It Sy mediatype
+Type of the media. NOR: 0 or NAND: 1.
+.El
 .Ss V7FS-specific options
 The following keywords are supported:
 .Pp
@@ -370,4 +388,6 @@ utility appeared in
 .An Ram Vedam
 (cd9660 support),
 .An UCHIYAMA Yasushi
-(v7fs support).
+(v7fs support),
+.An Tamas Toth
+(chfs support).

Index: src/usr.sbin/makefs/makefs.c
diff -u src/usr.sbin/makefs/makefs.c:1.31 src/usr.sbin/makefs/makefs.c:1.32
--- src/usr.sbin/makefs/makefs.c:1.31	Sat Jan 28 02:35:46 2012
+++ src/usr.sbin/makefs/makefs.c	Thu Apr 19 15:36:06 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: makefs.c,v 1.31 2012/01/28 02:35:46 christos Exp $	*/
+/*	$NetBSD: makefs.c,v 1.32 2012/04/19 15:36:06 ttoth Exp $	*/
 
 /*
  * Copyright (c) 2001-2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(__lint)
-__RCSID($NetBSD: makefs.c,v 1.31 2012/01/28 02:35:46 christos Exp $);
+__RCSID($NetBSD: makefs.c,v 1.32 2012/04/19 15:36:06 ttoth Exp $);
 #endif	/* !__lint */
 
 #include assert.h
@@ -73,6 +73,8 @@ static fstype_t fstypes[] = {
 	{ ffs, ffs_prep_opts,	ffs_parse_opts,	ffs_cleanup_opts, ffs_makefs },
 	{ cd9660, cd9660_prep_opts, cd9660_parse_opts, cd9660_cleanup_opts,
 	  cd9660_makefs},
+	{ chfs, chfs_prep_opts, chfs_parse_opts, chfs_cleanup_opts,
+	  chfs_makefs },
 	{ v7fs, v7fs_prep_opts, v7fs_parse_opts, v7fs_cleanup_opts,
 	  v7fs_makefs },
 	{ .type = NULL	},

Index: src/usr.sbin/makefs/makefs.h
diff -u src/usr.sbin/makefs/makefs.h:1.24 src/usr.sbin/makefs/makefs.h:1.25
--- src/usr.sbin/makefs/makefs.h:1.24	Sat Jan 28 02:35:46 2012
+++ src/usr.sbin/makefs/makefs.h	Thu Apr 19 15:36:06 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: makefs.h,v 1.24 2012/01/28 02:35:46 christos Exp $	*/
+/*	$NetBSD: makefs.h,v 1.25 2012/04/19 15:36:06 ttoth Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi

CVS commit: src/sys/ufs

2012-04-19 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Thu Apr 19 15:55:40 UTC 2012

Modified Files:
src/sys/ufs: files.ufs

Log Message:
chfs/debug.c deleted from files.ufs


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/ufs/files.ufs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/ufs/files.ufs
diff -u src/sys/ufs/files.ufs:1.27 src/sys/ufs/files.ufs:1.28
--- src/sys/ufs/files.ufs:1.27	Thu Nov 24 15:51:31 2011
+++ src/sys/ufs/files.ufs	Thu Apr 19 15:55:40 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: files.ufs,v 1.27 2011/11/24 15:51:31 ahoka Exp $
+#	$NetBSD: files.ufs,v 1.28 2012/04/19 15:55:40 ttoth Exp $
 
 deffs	FFS
 deffs	EXT2FS
@@ -36,7 +36,6 @@ file	ufs/chfs/chfs_gc.c		chfs
 file	ufs/chfs/chfs_nodeops.c		chfs
 file	ufs/chfs/chfs_malloc.c		chfs
 file	ufs/chfs/chfs_pool.c		chfs
-file	ufs/chfs/debug.c			chfs
 file	ufs/chfs/chfs_vnode.c		chfs
 file	ufs/chfs/chfs_subr.c		chfs
 file	ufs/chfs/chfs_vfsops.c		chfs

CVS commit: src/usr.sbin/makefs

2012-04-19 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Thu Apr 19 15:36:06 UTC 2012

Modified Files:
src/usr.sbin/makefs: Makefile makefs.8 makefs.c makefs.h
Added Files:
src/usr.sbin/makefs: chfs.c chfs_makefs.h
src/usr.sbin/makefs/chfs: Makefile.inc chfs_mkfs.c chfs_mkfs.h

Log Message:
added chfs support for makefs


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/makefs/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.sbin/makefs/chfs.c \
src/usr.sbin/makefs/chfs_makefs.h
cvs rdiff -u -r1.38 -r1.39 src/usr.sbin/makefs/makefs.8
cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/makefs/makefs.c
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/makefs/makefs.h
cvs rdiff -u -r0 -r1.1 src/usr.sbin/makefs/chfs/Makefile.inc \
src/usr.sbin/makefs/chfs/chfs_mkfs.c src/usr.sbin/makefs/chfs/chfs_mkfs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/ufs

2012-04-19 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Thu Apr 19 15:55:40 UTC 2012

Modified Files:
src/sys/ufs: files.ufs

Log Message:
chfs/debug.c deleted from files.ufs


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/ufs/files.ufs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/ufs/chfs

2012-04-13 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Fri Apr 13 14:50:35 UTC 2012

Modified Files:
src/sys/ufs/chfs: chfs.h chfs_inode.h chfs_vnode.c ebh.h

Log Message:
prepare for chfs's makefs


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/chfs/chfs.h
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/chfs/chfs_inode.h
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs_vnode.c
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/chfs/ebh.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/ufs/chfs/chfs.h
diff -u src/sys/ufs/chfs/chfs.h:1.5 src/sys/ufs/chfs/chfs.h:1.6
--- src/sys/ufs/chfs/chfs.h:1.5	Thu Apr 12 15:31:01 2012
+++ src/sys/ufs/chfs/chfs.h	Fri Apr 13 14:50:35 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs.h,v 1.5 2012/04/12 15:31:01 ttoth Exp $	*/
+/*	$NetBSD: chfs.h,v 1.6 2012/04/13 14:50:35 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -38,6 +38,9 @@
 #ifndef __CHFS_H__
 #define __CHFS_H__
 
+
+#ifdef _KERNEL
+
 #if 0
 #define DBG_MSG
 #define DBG_MSG_GC
@@ -71,13 +74,19 @@
 TAILQ_HEAD(chfs_dirent_list, chfs_dirent);
 
 #include chfs_pool.h
+#endif /* _KERNEL */
+
 #include ebh.h
 #include media.h
 #include chfs_inode.h
 
+#define CHFS_PAD(x) (((x)+3)~3)
+
+#ifdef _KERNEL
+
 #ifndef MOUNT_CHFS
 #define MOUNT_CHFS chfs
-#endif
+#endif /* MOUNT_CHFS */
 
 enum {
 	VNO_STATE_UNCHECKED,	/* CRC checks not yet done */
@@ -97,8 +106,6 @@ enum {
 #define MAX_DIRTY_TO_CLEAN 255
 #define VERY_DIRTY(chmp, size) ((size) = (((chmp)-chm_ebh)-eb_size / 2))
 
-#define CHFS_PAD(x) (((x)+3)~3)
-
 enum {
 	CHFS_NODE_OK = 0,
 	CHFS_NODE_BADMAGIC,
@@ -764,4 +771,5 @@ CHFS_PAGES_MAX(struct chfs_mount *chmp)
 #define IMPLIES(a, b) (!(a) || (b))
 #define IFF(a, b) (IMPLIES(a, b)  IMPLIES(b, a))
 
+#endif /* _KERNEL */
 #endif /* __CHFS_H__ */

Index: src/sys/ufs/chfs/chfs_inode.h
diff -u src/sys/ufs/chfs/chfs_inode.h:1.3 src/sys/ufs/chfs/chfs_inode.h:1.4
--- src/sys/ufs/chfs/chfs_inode.h:1.3	Thu Apr 12 15:31:01 2012
+++ src/sys/ufs/chfs/chfs_inode.h	Fri Apr 13 14:50:35 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs_inode.h,v 1.3 2012/04/12 15:31:01 ttoth Exp $	*/
+/*	$NetBSD: chfs_inode.h,v 1.4 2012/04/13 14:50:35 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -35,10 +35,12 @@
 #ifndef __CHFS_INODE_H__
 #define __CHFS_INODE_H__
 
+#ifdef _KERNEL
 #include sys/vnode.h
 #include sys/stat.h
 #include ufs/ufs/ufsmount.h
 #include miscfs/genfs/genfs_node.h
+#endif /* _KERNEL */
 
 #define CHFS_ROOTINO 2
 
@@ -59,11 +61,17 @@ enum chtype {
 #define CHTTOVT(ch_type)	ch_type
 #define VTTOCHT(v_type)		v_type
 
-extern const enum chtype iftocht_tab[16];
+/* vtype replaced with chtype, these are only for compatibility */
+static const enum chtype iftocht_tab[16] = {
+	CHT_BLANK, CHT_FIFO, CHT_CHR, CHT_BLANK,
+	CHT_DIR, CHT_BLANK, CHT_BLK, CHT_BLANK,
+	CHT_REG, CHT_BLANK, CHT_LNK, CHT_BLANK,
+	CHT_SOCK, CHT_BLANK, CHT_BLANK, CHT_BAD,
+};
 
 #define	IFTOCHT(mode)	(iftocht_tab[((mode)  S_IFMT)  12])
 
-
+#ifdef _KERNEL
 struct chfs_inode
 {
 	struct genfs_node	gnode;
@@ -159,4 +167,5 @@ struct chfs_inode
 #define	IFSOCK		014		/* UNIX domain socket. */
 #define	IFWHT		016		/* Whiteout. */
 
+#endif /* _KERNEL */
 #endif /* __CHFS_INODE_H__ */

Index: src/sys/ufs/chfs/chfs_vnode.c
diff -u src/sys/ufs/chfs/chfs_vnode.c:1.4 src/sys/ufs/chfs/chfs_vnode.c:1.5
--- src/sys/ufs/chfs/chfs_vnode.c:1.4	Thu Apr 12 15:31:01 2012
+++ src/sys/ufs/chfs/chfs_vnode.c	Fri Apr 13 14:50:35 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs_vnode.c,v 1.4 2012/04/12 15:31:01 ttoth Exp $	*/
+/*	$NetBSD: chfs_vnode.c,v 1.5 2012/04/13 14:50:35 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -42,15 +42,6 @@
 
 #include miscfs/genfs/genfs.h
 
-/* vtype replaced with chtype, these are only for compatibility */
-const enum chtype iftocht_tab[16] = {
-	CHT_BLANK, CHT_FIFO, CHT_CHR, CHT_BLANK,
-	CHT_DIR, CHT_BLANK, CHT_BLK, CHT_BLANK,
-	CHT_REG, CHT_BLANK, CHT_LNK, CHT_BLANK,
-	CHT_SOCK, CHT_BLANK, CHT_BLANK, CHT_BAD,
-};
-
-
 struct vnode *
 chfs_vnode_lookup(struct chfs_mount *chmp, ino_t vno)
 {

Index: src/sys/ufs/chfs/ebh.h
diff -u src/sys/ufs/chfs/ebh.h:1.1 src/sys/ufs/chfs/ebh.h:1.2
--- src/sys/ufs/chfs/ebh.h:1.1	Thu Nov 24 15:51:32 2011
+++ src/sys/ufs/chfs/ebh.h	Fri Apr 13 14:50:35 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: ebh.h,v 1.1 2011/11/24 15:51:32 ahoka Exp $	*/
+/*	$NetBSD: ebh.h,v 1.2 2012/04/13 14:50:35 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -42,6 +42,7 @@
 #ifndef EBH_H_
 #define EBH_H_
 
+#ifdef _KERNEL
 #include sys/param.h
 #include sys/kernel.h
 #include sys/cdefs.h
@@ -57,10 +58,27 @@
 #include sys/kthread.h
 
 #include dev/flash/flash.h
-#include ufs/chfs/ebh_media.h
-#include ufs/chfs/debug.h
-#include ufs/chfs/ebh_misc.h
+#include debug.h
+#include ebh_misc.h
+#endif /* _KERNEL */
 
+#include ebh_media.h
+

CVS commit: src/sys/ufs/chfs

2012-04-13 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Fri Apr 13 14:50:35 UTC 2012

Modified Files:
src/sys/ufs/chfs: chfs.h chfs_inode.h chfs_vnode.c ebh.h

Log Message:
prepare for chfs's makefs


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/chfs/chfs.h
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/chfs/chfs_inode.h
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs_vnode.c
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/chfs/ebh.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys

2012-04-12 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Thu Apr 12 15:31:01 UTC 2012

Modified Files:
src/sys/modules/chfs: Makefile
src/sys/ufs/chfs: chfs.h chfs_build.c chfs_inode.h chfs_subr.c
chfs_vfsops.c chfs_vnode.c chfs_vnops.c chfs_write.c debug.h
Removed Files:
src/sys/ufs/chfs: debug.c

Log Message:
using chtype on media instead of vtype
debug.c deleted


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/chfs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/chfs/chfs_build.c \
src/sys/ufs/chfs/chfs_inode.h src/sys/ufs/chfs/chfs_vfsops.c \
src/sys/ufs/chfs/chfs_write.c
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/chfs/chfs_subr.c \
src/sys/ufs/chfs/chfs_vnode.c src/sys/ufs/chfs/chfs_vnops.c
cvs rdiff -u -r1.1 -r0 src/sys/ufs/chfs/debug.c
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/chfs/debug.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/chfs/Makefile
diff -u src/sys/modules/chfs/Makefile:1.2 src/sys/modules/chfs/Makefile:1.3
--- src/sys/modules/chfs/Makefile:1.2	Sat Feb  4 18:35:56 2012
+++ src/sys/modules/chfs/Makefile	Thu Apr 12 15:31:01 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2012/02/04 18:35:56 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2012/04/12 15:31:01 ttoth Exp $
 
 .include ../Makefile.inc
 
@@ -7,7 +7,7 @@
 CPPFLAGS+=	-DDIAGNOSTIC -DDEBUG -DLOCKDEBUG
 
 KMOD=	chfs
-SRCS=	ebh.c debug.c chfs_wbuf.c chfs_vnode_cache.c chfs_ihash.c
+SRCS=	ebh.c chfs_wbuf.c chfs_vnode_cache.c chfs_ihash.c
 SRCS+=  chfs_gc.c
 SRCS+=  chfs_vnode.c chfs_erase.c chfs_write.c chfs_readinode.c
 SRCS+=  chfs_build.c chfs_scan.c chfs_nodeops.c chfs_malloc.c

Index: src/sys/ufs/chfs/chfs.h
diff -u src/sys/ufs/chfs/chfs.h:1.4 src/sys/ufs/chfs/chfs.h:1.5
--- src/sys/ufs/chfs/chfs.h:1.4	Mon Nov 28 12:50:07 2011
+++ src/sys/ufs/chfs/chfs.h	Thu Apr 12 15:31:01 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs.h,v 1.4 2011/11/28 12:50:07 ahoka Exp $	*/
+/*	$NetBSD: chfs.h,v 1.5 2012/04/12 15:31:01 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -79,8 +79,6 @@ TAILQ_HEAD(chfs_dirent_list, chfs_dirent
 #define MOUNT_CHFS chfs
 #endif
 
-#define CHFS_ROOTINO ROOTINO/* ROOTINO == 2 */
-
 enum {
 	VNO_STATE_UNCHECKED,	/* CRC checks not yet done */
 	VNO_STATE_CHECKING,	/* CRC checks in progress */
@@ -91,6 +89,7 @@ enum {
 	VNO_STATE_CLEARING	/* In clear_inode() */
 };
 
+
 #define VNODECACHE_SIZE 128
 
 #define MAX_READ_FREE(chmp) (((chmp)-chm_ebh)-eb_size / 8)
@@ -185,7 +184,7 @@ struct chfs_dirent
 	uint64_t version;
 	ino_t vno;
 	uint32_t nhash;
-	enum vtype type;
+	enum chtype type;
 	uint8_t  nsize;
 	uint8_t  name[0];
 
@@ -631,7 +630,7 @@ int chfs_readvnode(struct mount *, ino_t
 int chfs_readdirent(struct mount *, struct chfs_node_ref *,
 struct chfs_inode *);
 int chfs_makeinode(int, struct vnode *, struct vnode **,
-struct componentname *, int );
+struct componentname *, enum vtype );
 void chfs_set_vnode_size(struct vnode *, size_t);
 void chfs_change_size_free(struct chfs_mount *,
 	struct chfs_eraseblock *, int);
@@ -665,7 +664,7 @@ int chfs_write_flash_dirent(struct chfs_
 int chfs_write_flash_dnode(struct chfs_mount *, struct vnode *,
 struct buf *, struct chfs_full_dnode *);
 int chfs_do_link(struct chfs_inode *,
-struct chfs_inode *, const char *, int, enum vtype);
+struct chfs_inode *, const char *, int, enum chtype);
 int chfs_do_unlink(struct chfs_inode *,
 struct chfs_inode *, const char *, int);
 
@@ -673,7 +672,7 @@ int chfs_do_unlink(struct chfs_inode *,
 size_t chfs_mem_info(bool);
 struct chfs_dirent * chfs_dir_lookup(struct chfs_inode *,
 struct componentname *);
-int chfs_filldir (struct uio *, ino_t, const char *, int, enum vtype);
+int chfs_filldir (struct uio *, ino_t, const char *, int, enum chtype);
 int chfs_chsize(struct vnode *, u_quad_t, kauth_cred_t);
 int chfs_chflags(struct vnode *, int, kauth_cred_t);
 void chfs_itimes(struct chfs_inode *, const struct timespec *,

Index: src/sys/ufs/chfs/chfs_build.c
diff -u src/sys/ufs/chfs/chfs_build.c:1.2 src/sys/ufs/chfs/chfs_build.c:1.3
--- src/sys/ufs/chfs/chfs_build.c:1.2	Thu Nov 24 21:22:39 2011
+++ src/sys/ufs/chfs/chfs_build.c	Thu Apr 12 15:31:01 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: chfs_build.c,v 1.2 2011/11/24 21:22:39 agc Exp $	*/
+/*	$NetBSD: chfs_build.c,v 1.3 2012/04/12 15:31:01 ttoth Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -84,7 +84,7 @@ chfs_build_set_vnodecache_nlink(struct c
 			chfs_mark_node_obsolete(chmp, fd-nref);
 			continue;
 		}
-		if (fd-type == VDIR) {
+		if (fd-type == CHT_DIR) {
 			if (child_vc-nlink  1)
 child_vc-nlink = 1;
 
@@ -372,7 +372,7 @@ chfs_build_filesystem(struct chfs_mount 
 	nref = fd-nref;
 	*nref = fd-nref-nref_next;
 	//fd-nref-nref_next = NULL;
-} else if (fd-type ==

CVS commit: src/distrib/notes/common

2012-04-12 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Thu Apr 12 15:39:09 UTC 2012

Modified Files:
src/distrib/notes/common: main

Log Message:
Add myself.


To generate a diff of this commit:
cvs rdiff -u -r1.485 -r1.486 src/distrib/notes/common/main

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.485 src/distrib/notes/common/main:1.486
--- src/distrib/notes/common/main:1.485	Fri Mar 16 05:43:09 2012
+++ src/distrib/notes/common/main	Thu Apr 12 15:39:09 2012
@@ -1,4 +1,4 @@
-.\	$NetBSD: main,v 1.485 2012/03/16 05:43:09 jkoshy Exp $
+.\	$NetBSD: main,v 1.486 2012/04/12 15:39:09 ttoth Exp $
 .\
 .\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -1355,6 +1355,7 @@ If you're one of them, and would like to
 .It Ta Matt Thomas Ta Mt m...@netbsd.org
 .It Ta Jason Thorpe Ta Mt thor...@netbsd.org
 .It Ta Christoph Toshok Ta Mt tos...@netbsd.org
+.It Ta Tam\('as T\('oth Ta Mt tt...@netbsd.org
 .It Ta Greg Troxel Ta Mt g...@netbsd.org
 .It Ta Tsubai Masanari Ta Mt tsu...@netbsd.org
 .It Ta Izumi Tsutsui Ta Mt tsut...@netbsd.org

CVS commit: src/sys

2012-04-12 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Thu Apr 12 15:31:01 UTC 2012

Modified Files:
src/sys/modules/chfs: Makefile
src/sys/ufs/chfs: chfs.h chfs_build.c chfs_inode.h chfs_subr.c
chfs_vfsops.c chfs_vnode.c chfs_vnops.c chfs_write.c debug.h
Removed Files:
src/sys/ufs/chfs: debug.c

Log Message:
using chtype on media instead of vtype
debug.c deleted


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/chfs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/chfs/chfs_build.c \
src/sys/ufs/chfs/chfs_inode.h src/sys/ufs/chfs/chfs_vfsops.c \
src/sys/ufs/chfs/chfs_write.c
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/chfs/chfs_subr.c \
src/sys/ufs/chfs/chfs_vnode.c src/sys/ufs/chfs/chfs_vnops.c
cvs rdiff -u -r1.1 -r0 src/sys/ufs/chfs/debug.c
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/chfs/debug.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/notes/common

2012-04-12 Thread Tamas Toth 
Module Name:src
Committed By:   ttoth
Date:   Thu Apr 12 15:39:09 UTC 2012

Modified Files:
src/distrib/notes/common: main

Log Message:
Add myself.


To generate a diff of this commit:
cvs rdiff -u -r1.485 -r1.486 src/distrib/notes/common/main

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.