From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Dec 2009 16:31:01 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
X-Git-Tag: v2.6.33-rc1~34
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b8a7f3cd7e8212e5c572178ff3b5a514861036a5;p=linux-2.6-block.git

Merge branch 'master' of git://git./linux/kernel/git/viro/vfs-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  kill I_LOCK
  fold do_sync_file_range into sys_sync_file_range
  fix up O_SYNC comments
  VFS/fsstack: handle 32-bit smp + preempt + large files in fsstack_copy_inode_size
  fsstack/ecryptfs: remove unused get_nlinks param to fsstack_copy_attr_all
  vfs: remove extraneous NULL d_inode check from do_filp_open
  fs: no games with DCACHE_UNHASHED
  fs: anon_inodes implement dname
  dio: fix use-after-free
---

b8a7f3cd7e8212e5c572178ff3b5a514861036a5