Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 0 insertions, 3 deletions

diff --git a/mm/msync.c b/mm/msync.c
index bc6c95376366..d083544df21b 100644
--- a/mm/msync.c
+++ b/mm/msync.c
@@ -170,8 +170,6 @@ asmlinkage long sys_msync(unsigned long start, size_t len, int flags)
          * just ignore them, but return -ENOMEM at the end.
          */
         down_read(&current->mm->mmap_sem);
-        if (flags & MS_SYNC)
-                current->flags |= PF_SYNCWRITE;
         vma = find_vma(current->mm, start);
         if (!vma) {
                 error = -ENOMEM;
@@ -228,7 +226,6 @@ asmlinkage long sys_msync(unsigned long start, size_t len, int flags)
                 }
         } while (vma && !done);
 out_unlock:
-        current->flags &= ~PF_SYNCWRITE;
         up_read(&current->mm->mmap_sem);
 out:
         return error;