commit fe5a2de17e65d82b9d502da80ccb5a689d03fdd2
author Linus Torvalds <torvalds@woody.linux-foundation.org> Sun Jul 08 12:14:27 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Sun Jul 08 12:14:27 2007 -0700
tree 546492b849c1113ac6889395c353ae577860c7fd
parent 1e5de2837c166535f9bb4232bfe97ea1f9fc7a1c
parent 4660897e6c2daa198fc8e3f47ae2a4aef69c80b0

Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  qd65xx: fix PIO mode selection
  sis5513: adding PCI-ID

fs/utimes.c

diff --git a/fs/utimes.c b/fs/utimes.c
index 480f7c8..b3c8895 100644
--- a/fs/utimes.c
+++ b/fs/utimes.c
@@ -106,9 +106,16 @@
                 if (IS_IMMUTABLE(inode))
                         goto dput_and_out;
 
-		if (current->fsuid != inode->i_uid &&
-		    (error = vfs_permission(&nd, MAY_WRITE)) != 0)
-			goto dput_and_out;
+		if (current->fsuid != inode->i_uid) {
+			if (f) {
+				if (!(f->f_mode & FMODE_WRITE))
+					goto dput_and_out;
+			} else {
+				error = vfs_permission(&nd, MAY_WRITE);
+				if (error)
+					goto dput_and_out;
+			}
+		}
 	}
 	mutex_lock(&inode->i_mutex);
 	error = notify_change(dentry, &newattrs);

mm/filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index edb1b0b..d1d9814 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1786,7 +1786,6 @@
 	page = __read_cache_page(mapping, index, filler, data);
 	if (IS_ERR(page))
 		return page;
-	mark_page_accessed(page);
 	if (PageUptodate(page))
 		goto out;