merge

butterflyfs.c

@@ -29,18 +29,6 @@ int butterfly_fill_super(struct super_block *sb, void *data, int silent)
     };
 
     return simple_fill_super(sb, BUTTERFLY_MAGIC, treeDescr);
-    /*
-    struct dentry *root = (struct dentry *) kmalloc(sizeof(*root), GFP_KERNEL);
-    struct inode *rootIno = (struct inode *) kmalloc(sizeof(*rootIno), GFP_KERNEL);
-
-    root->d_parent = root;
-    root->d_inode = rootIno;
-    root->d_iname[0] = '\0';
-    root->d_op = &directoryOperations;
-
-    root->d_child.prev = root->d_child.next = &root->d_child;
-    root->d_subdirs.prev = root->d_subdirs.next = &root->d_subdirs;
-    */
 }
 
 struct dentry   *butterfly_mount(