commit 97db4bb42982c09f45d0eb339e5204217742331a
Author: Erez Zadok <[EMAIL PROTECTED]>
Date: Sun Sep 30 14:15:48 2007 -0400
Unionfs: minor comment cleanups
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
index 34dbfcf..585e577 100644
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -673,8 +673,6 @@ static long do_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
if (!lower_file || !lower_file->f_op)
goto out;
if (lower_file->f_op->ioctl) {
- // err = lower_file->f_op->ioctl(lower_file, cmd, arg);
- // } else if (lower_file->f_op->ioctl) {
lock_kernel();
err = lower_file->f_op->ioctl(lower_file->f_dentry->d_inode,
lower_file, cmd, arg);
diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 6f240cb..1b3fd83 100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -206,7 +206,7 @@ struct dentry *unionfs_lookup_backend(struct dentry *dentry,
}
if (wh_lower_dentry->d_inode) {
- /* We found a whiteout so lets give up. */
+ /* We found a whiteout so let's give up. */
if (S_ISREG(wh_lower_dentry->d_inode->i_mode)) {
set_dbend(dentry, bindex);
set_dbopaque(dentry, bindex);
diff --git a/fs/unionfs/mmap.c b/fs/unionfs/mmap.c
index 1dba561..f474e5d 100644
--- a/fs/unionfs/mmap.c
+++ b/fs/unionfs/mmap.c
@@ -59,7 +59,6 @@ static int unionfs_writepage(struct page *page, struct
writeback_control *wbc)
struct inode *lower_inode;
struct page *lower_page;
char *kaddr, *lower_kaddr;
- // int saved_for_writepages = wbc->for_writepages;
inode = page->mapping->host;
lower_inode = unionfs_lower_inode(inode);
@@ -102,13 +101,10 @@ static int unionfs_writepage(struct page *page, struct
writeback_control *wbc)
BUG_ON(!lower_inode->i_mapping->a_ops->writepage);
/* workaround for some lower file systems: see big comment on top */
- // if (wbc->for_writepages && !wbc->fs_private)
- // wbc->for_writepages = 0;
/* call lower writepage (expects locked page) */
clear_page_dirty_for_io(lower_page); /* emulate VFS behavior */
err = lower_inode->i_mapping->a_ops->writepage(lower_page, wbc);
- // wbc->for_writepages = saved_for_writepages; /* restore value */
/* b/c find_lock_page locked it and ->writepage unlocks on success */
if (err)
@@ -293,7 +289,7 @@ static int unionfs_commit_write(struct file *file, struct
page *page,
lower_file->f_pos = ((loff_t) page->index << PAGE_CACHE_SHIFT) + from;
/*
- * SP: I use vfs_write instead of copying page data and the
+ * We use vfs_write instead of copying page data and the
* prepare_write/commit_write combo because file system's like
* GFS/OCFS2 don't like things touching those directly,
* calling the underlying write op, while a little bit slower, will
diff --git a/fs/unionfs/rdstate.c b/fs/unionfs/rdstate.c
index 795d23e..a0785aa 100644
--- a/fs/unionfs/rdstate.c
+++ b/fs/unionfs/rdstate.c
@@ -126,7 +126,7 @@ struct unionfs_dir_state *alloc_rdstate(struct inode
*inode, int bindex)
hashsize = guesstimate_hash_size(inode);
mallocsize += hashsize * sizeof(struct list_head);
- // mallocsize = __roundup_pow_of_two(mallocsize);
+ /* mallocsize = __roundup_pow_of_two(mallocsize); */
/* This should give us about 500 entries anyway. */
if (mallocsize > PAGE_SIZE)
diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index 60544e3..e1c81a8 100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -716,7 +716,7 @@ out_no_change:
* which use two passes over the pages list, and will truncate all
* pages.
*/
- // drop_pagecache_sb(sb);
+ /* drop_pagecache_sb(sb); */
/* copy new vectors into their correct place */
tmp_data = UNIONFS_SB(sb)->data;
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index eee352e..bce23fe 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -41,9 +41,6 @@
#include <linux/buffer_head.h>
#include <linux/xattr.h>
#include <linux/fs_stack.h>
-//#include <linux/magic.h>
-//#include <linux/log2.h>
-//#include <linux/poison.h>
#include <asm/mman.h>
#include <asm/system.h>
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
