GIT: unionfs2-2.6.27.y: mmap: #if 0 unneeded code instead of commenting it out

[Erez Zadok]

commit 3eec1a470a136f2c13149b69e4b81668e21424e0
Author: Yiannis Pericleous <yiannos at louie.fsl.cs.sunysb.edu>
Date:   Tue May 1 19:11:53 2007 -0400

    mmap: #if 0 unneeded code instead of commenting it out

diff --git a/fs/unionfs/file.c b/fs/unionfs/file.c
index 28565a1..4f6859c 100644
--- a/fs/unionfs/file.c
+++ b/fs/unionfs/file.c
@@ -33,12 +33,12 @@ static ssize_t unionfs_read(struct file *file, char __user *buf,
 
 	err = do_sync_read(file, buf, count, ppos);
 
-/*
+#if 0
 	FIXME: do_sync_read updates a time
 	if (err >= 0)
 		touch_atime(unionfs_lower_mnt(file->f_path.dentry),
 				unionfs_lower_dentry(file->f_path.dentry));
-*/
+#endif
 
 out:
 	unionfs_read_unlock(file->f_dentry->d_sb);
@@ -49,7 +49,6 @@ out:
 static ssize_t unionfs_aio_read(struct kiocb *iocb, const struct iovec *iov,
 				unsigned long nr_segs, loff_t pos)
 {
-	struct file *file = iocb->ki_filp;
 	int err;
 #error fixme fxn check_file? read_unlock?
 	err = generic_file_aio_read(iocb, iov, nr_segs, pos);
@@ -57,11 +56,12 @@ static ssize_t unionfs_aio_read(struct kiocb *iocb, const struct iovec *iov,
 	if (err == -EIOCBQUEUED)
 		err = wait_on_sync_kiocb(iocb);
 
-/*	XXX: is this needed?
+#if 0
+	XXX: is this needed?
 	if (err >= 0)
-		touch_atime(unionfs_lower_mnt(file->f_path.dentry),
-				unionfs_lower_dentry(file->f_path.dentry));
-*/
+		touch_atime(unionfs_lower_mnt(iocb->ki_filp->f_path.dentry),
+				unionfs_lower_dentry(iocb->ki_filp->f_path.dentry));
+#endif
 
 #if 0
 out: