From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Jan 2011 04:14:13 +0000 (-0800)
Subject: Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.38-rc1~71
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db9effe99adc67c53e6aedadadd2aa9a02342e48;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'vfs-scale-working' of git://git./linux/kernel/git/npiggin/linux-npiggin

* 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin:
  fs: fix do_last error case when need_reval_dot
  nfs: add missing rcu-walk check
  fs: hlist UP debug fixup
  fs: fix dropping of rcu-walk from force_reval_path
  fs: force_reval_path drop rcu-walk before d_invalidate
  fs: small rcu-walk documentation fixes

Fixed up trivial conflicts in Documentation/filesystems/porting
---

db9effe99adc67c53e6aedadadd2aa9a02342e48
diff --cc Documentation/filesystems/porting
index 266d205,7fcac63..dfbcd1b
--- a/Documentation/filesystems/porting
+++ b/Documentation/filesystems/porting
@@@ -383,14 -383,5 +383,14 @@@ Documentation/filesystems/vfs.txt for m
  
  	permission and check_acl are inode permission checks that are called
  on many or all directory inodes on the way down a path walk (to check for
- exec permission). These must now be rcu-walk aware (flags & IPERM_RCU). See
- Documentation/filesystems/vfs.txt for more details.
+ exec permission). These must now be rcu-walk aware (flags & IPERM_FLAG_RCU).
+ See Documentation/filesystems/vfs.txt for more details.
 + 
 +--
 +[mandatory]
 +	In ->fallocate() you must check the mode option passed in.  If your
 +filesystem does not support hole punching (deallocating space in the middle of a
 +file) you must return -EOPNOTSUPP if FALLOC_FL_PUNCH_HOLE is set in mode.
 +Currently you can only have FALLOC_FL_PUNCH_HOLE with FALLOC_FL_KEEP_SIZE set,
 +so the i_size should not change when hole punching, even when puching the end of
 +a file off.