head	1.1;
access;
symbols
	LKML-branch:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.10.25.08.14.17;	author jsipek;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.10.25.08.14.17;	author jsipek;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2006.11.07.04.55.34;	author jsipek;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2006.11.07.06.13.33;	author jsipek;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2006.11.28.08.06.50;	author jsipek;	state Exp;
branches;
next	1.1.2.5;

1.1.2.5
date	2006.11.28.08.30.13;	author jsipek;	state dead;
branches;
next	;


desc
@@


1.1
log
@file unionfs-fix-comments was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Some comments by Pekka
@
text
@a0 136
diff -r 219a5dc5f6cf fs/unionfs/copyup.c
--- a/fs/unionfs/copyup.c	Wed Oct 25 03:57:21 2006 -0400
+++ b/fs/unionfs/copyup.c	Wed Oct 25 04:03:13 2006 -0400
@@@@ -50,7 +50,7 @@@@ static int copyup_xattrs(struct dentry *
 	while (*name_list) {
 		ssize_t size;
 
-		//We need to lock here since vfs_getxattr doesn't lock for us.
+		/* We need to lock here since vfs_getxattr doesn't lock for us. */
 		mutex_lock(&old_hidden_dentry->d_inode->i_mutex);
 		size = vfs_getxattr(old_hidden_dentry, name_list,
 				    attr_value, XATTR_SIZE_MAX);
@@@@ -64,7 +64,7 @@@@ static int copyup_xattrs(struct dentry *
 			err = -E2BIG;
 			goto out;
 		}
-		//We don't need to lock here since vfs_setxattr does it for us.
+		/* We don't need to lock here since vfs_setxattr does it for us. */
 		err = vfs_setxattr(new_hidden_dentry, name_list, attr_value,
 				   size, 0);
 
@@@@ -656,16 +656,16 @@@@ struct dentry *create_parents_named(stru
 	/* This is basically while(child_dentry != dentry).  This loop is
 	 * horrible to follow and should be replaced with cleaner code. */
 	while (1) {
-		// get hidden parent dir in the current branch
+		/* get hidden parent dir in the current branch */
 		hidden_parent_dentry = __fsstack_lower_dentry(parent_dentry, bindex);
 		unlock_dentry(parent_dentry);
 
-		// init the values to lookup
+		/* init the values to lookup */
 		childname = child_dentry->d_name.name;
 		childnamelen = child_dentry->d_name.len;
 
 		if (child_dentry != dentry) {
-			// lookup child in the underlying file system
+			/* lookup child in the underlying file system */
 			hidden_dentry =
 			    lookup_one_len(childname, hidden_parent_dentry,
 					   childnamelen);
@@@@ -674,7 +674,7 @@@@ struct dentry *create_parents_named(stru
 		} else {
 
 			/* is the name a whiteout of the childname ? */
-			//lookup the whiteout child in the underlying file system
+			/* lookup the whiteout child in the underlying file system */
 			hidden_dentry =
 			    lookup_one_len(name, hidden_parent_dentry,
 					   strlen(name));
diff -r 219a5dc5f6cf fs/unionfs/inode.c
--- a/fs/unionfs/inode.c	Wed Oct 25 03:57:21 2006 -0400
+++ b/fs/unionfs/inode.c	Wed Oct 25 04:03:37 2006 -0400
@@@@ -471,7 +471,7 @@@@ static int unionfs_mkdir(struct inode *p
 
 	hidden_dentry = dtohd(dentry);
 
-	// check if whiteout exists in this branch, i.e. lookup .wh.foo first
+	/* check if whiteout exists in this branch, i.e. lookup .wh.foo first */
 	name = alloc_whname(dentry->d_name.name, dentry->d_name.len);
 	if (IS_ERR(name)) {
 		err = PTR_ERR(name);
@@@@ -491,7 +491,7 @@@@ static int unionfs_mkdir(struct inode *p
 	} else {
 		hidden_parent_dentry = lock_parent(whiteout_dentry);
 
-		//found a.wh.foo entry, remove it then do vfs_mkdir
+		/* found a.wh.foo entry, remove it then do vfs_mkdir */
 		if (!(err = is_robranch_super(dentry->d_sb, bstart))) {
 			args.u.unlink.parent = hidden_parent_dentry->d_inode;
 			args.u.unlink.dentry = whiteout_dentry;
@@@@ -599,7 +599,7 @@@@ static int unionfs_mknod(struct inode *d
 
 	hidden_dentry = dtohd(dentry);
 
-	// check if whiteout exists in this branch, i.e. lookup .wh.foo first
+	/* check if whiteout exists in this branch, i.e. lookup .wh.foo first */
 	name = alloc_whname(dentry->d_name.name, dentry->d_name.len);
 	if (IS_ERR(name)) {
 		err = PTR_ERR(name);
@@@@ -621,7 +621,7 @@@@ static int unionfs_mknod(struct inode *d
 		/* found .wh.foo, unlink it */
 		hidden_parent_dentry = lock_parent(whiteout_dentry);
 
-		//found a.wh.foo entry, remove it then do vfs_mkdir
+		/* found a.wh.foo entry, remove it then do vfs_mkdir */
 		if (!(err = is_robranch_super(dentry->d_sb, bstart)))
 			err = vfs_unlink(hidden_parent_dentry->d_inode,
 					 whiteout_dentry);
diff -r 219a5dc5f6cf fs/unionfs/rdstate.c
--- a/fs/unionfs/rdstate.c	Wed Oct 25 03:57:21 2006 -0400
+++ b/fs/unionfs/rdstate.c	Wed Oct 25 04:04:17 2006 -0400
@@@@ -215,7 +215,6 @@@@ struct filldir_node *find_filldir_node(s
 			found = 1;
 			/* if the duplicate is in this branch, then the file system is corrupted. */
 			if (cursor->bindex == rdstate->uds_bindex) {
-				//buf->error = err = -EIO;
 				printk(KERN_DEBUG
 				       "Possible I/O error unionfs_filldir: a file is duplicated in the same branch %d: %s\n",
 				       rdstate->uds_bindex, cursor->name);
diff -r 219a5dc5f6cf fs/unionfs/sioq.c
--- a/fs/unionfs/sioq.c	Wed Oct 25 03:57:21 2006 -0400
+++ b/fs/unionfs/sioq.c	Wed Oct 25 04:04:22 2006 -0400
@@@@ -46,7 +46,7 @@@@ void run_sioq(void (*func)(void *arg), s
 
 	init_completion(&args->comp);
 	while (!queue_work(sioq, &wk)) {
-		// TODO: do accounting if needed
+		/* TODO: do accounting if needed */
 		schedule();
 	}
 	wait_for_completion(&args->comp);
diff -r 219a5dc5f6cf fs/unionfs/union.h
--- a/fs/unionfs/union.h	Wed Oct 25 03:57:21 2006 -0400
+++ b/fs/unionfs/union.h	Wed Oct 25 04:05:00 2006 -0400
@@@@ -144,13 +144,13 @@@@ struct unionfs_sb_info {
  * to compare with entries on right branch
  */
 struct filldir_node {
-	struct list_head file_list;	// list for directory entries
-	char *name;		// name entry
-	int hash;		// name hash
-	int namelen;		// name len since name is not 0 terminated
-	int bindex;		// we can check for duplicate whiteouts and files in the same branch in order to return -EIO.
-	int whiteout;		// is this a whiteout entry?
-	char iname[DNAME_INLINE_LEN_MIN];	// Inline name, so we don't need to separately kmalloc small ones
+	struct list_head file_list;	/* list for directory entries */
+	char *name;		/* name entry */
+	int hash;		/* name hash */
+	int namelen;		/* name len since name is not 0 terminated */
+	int bindex;		/* we can check for duplicate whiteouts and files in the same branch in order to return -EIO. */
+	int whiteout;		/* is this a whiteout entry? */
+	char iname[DNAME_INLINE_LEN_MIN];	/* Inline name, so we don't need to separately kmalloc small ones */
 };
 
 /* Directory hash table. */
@


1.1.2.2
log
@Move patches over to a real git tree
@
text
@d1 3
a3 3
diff -r 9fc8b17fe744 fs/unionfs/copyup.c
--- a/fs/unionfs/copyup.c	Mon Nov 06 12:51:36 2006 -0500
+++ b/fs/unionfs/copyup.c	Mon Nov 06 12:52:34 2006 -0500
d28 1
a28 1
 		hidden_parent_dentry = dtohd_index(parent_dentry, bindex);
d51 3
a53 3
diff -r 9fc8b17fe744 fs/unionfs/inode.c
--- a/fs/unionfs/inode.c	Mon Nov 06 12:51:36 2006 -0500
+++ b/fs/unionfs/inode.c	Mon Nov 06 12:51:36 2006 -0500
d90 3
a92 3
diff -r 9fc8b17fe744 fs/unionfs/rdstate.c
--- a/fs/unionfs/rdstate.c	Mon Nov 06 12:51:36 2006 -0500
+++ b/fs/unionfs/rdstate.c	Mon Nov 06 12:51:36 2006 -0500
d101 3
a103 3
diff -r 9fc8b17fe744 fs/unionfs/sioq.c
--- a/fs/unionfs/sioq.c	Mon Nov 06 12:51:36 2006 -0500
+++ b/fs/unionfs/sioq.c	Mon Nov 06 12:51:36 2006 -0500
d113 3
a115 3
diff -r 9fc8b17fe744 fs/unionfs/union.h
--- a/fs/unionfs/union.h	Mon Nov 06 12:51:36 2006 -0500
+++ b/fs/unionfs/union.h	Mon Nov 06 12:51:36 2006 -0500
@


1.1.2.3
log
@Git generates slightly different diffs - same information, just little
different
@
text
@d1 3
a3 4
diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index 9df2d99..0cb5d89 100644
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
d51 3
a53 4
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index 8268221..a7db48a 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
d90 3
a92 4
diff --git a/fs/unionfs/rdstate.c b/fs/unionfs/rdstate.c
index f3d4e9d..72668d2 100644
--- a/fs/unionfs/rdstate.c
+++ b/fs/unionfs/rdstate.c
d101 3
a103 4
diff --git a/fs/unionfs/sioq.c b/fs/unionfs/sioq.c
index 6001d48..4d1fb0a 100644
--- a/fs/unionfs/sioq.c
+++ b/fs/unionfs/sioq.c
d113 3
a115 4
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 9a216b0..77193bb 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@


1.1.2.4
log
@Sync...
@
text
@d1 4
a4 3
diff -r 7c1eaeb60109 fs/unionfs/copyup.c
--- a/fs/unionfs/copyup.c	Tue Nov 28 02:57:45 2006 -0500
+++ b/fs/unionfs/copyup.c	Tue Nov 28 02:59:29 2006 -0500
d52 4
a55 3
diff -r 7c1eaeb60109 fs/unionfs/inode.c
--- a/fs/unionfs/inode.c	Tue Nov 28 02:57:45 2006 -0500
+++ b/fs/unionfs/inode.c	Tue Nov 28 02:59:29 2006 -0500
d72 2
a73 2
 			args.unlink.parent = hidden_parent_dentry->d_inode;
 			args.unlink.dentry = whiteout_dentry;
d92 4
a95 3
diff -r 7c1eaeb60109 fs/unionfs/rdstate.c
--- a/fs/unionfs/rdstate.c	Tue Nov 28 02:57:45 2006 -0500
+++ b/fs/unionfs/rdstate.c	Tue Nov 28 02:59:29 2006 -0500
d104 4
a107 3
diff -r 7c1eaeb60109 fs/unionfs/sioq.c
--- a/fs/unionfs/sioq.c	Tue Nov 28 02:57:45 2006 -0500
+++ b/fs/unionfs/sioq.c	Tue Nov 28 02:59:29 2006 -0500
d117 4
a120 3
diff -r 7c1eaeb60109 fs/unionfs/union.h
--- a/fs/unionfs/union.h	Tue Nov 28 02:57:45 2006 -0500
+++ b/fs/unionfs/union.h	Tue Nov 28 02:59:29 2006 -0500
@


1.1.2.5
log
@Collapsed: struct_path-unionfs unionfs-fix-comments unionfs-kill-wrappers
@
text
@@


