Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  truncate: use new helpers
  truncate: new helpers
  fs: fix overflow in sys_mount() for in-kernel calls
  fs: Make unload_nls() NULL pointer safe
  freeze_bdev: grab active reference to frozen superblocks
  freeze_bdev: kill bd_mount_sem
  exofs: remove BKL from super operations
  fs/romfs: correct error-handling code
  vfs: seq_file: add helpers for data filling
  vfs: remove redundant position check in do_sendfile
  vfs: change sb->s_maxbytes to a loff_t
  vfs: explicitly cast s_maxbytes in fiemap_check_ranges
  libfs: return error code on failed attr set
  seq_file: return a negative error code when seq_path_root() fails.
  vfs: optimize touch_time() too
  vfs: optimization for touch_atime()
  vfs: split generic_forget_inode() so that hugetlbfs does not have to copy it
  fs/inode.c: add dev-id and inode number for debugging in init_special_inode()
  libfs: make simple_read_from_buffer conventional

diff --cc fs/hugetlbfs/inode.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/mm.h
index 6953a5a,8347e93..df08551
--- 1/include/linux/mm.h
--- 2/include/linux/mm.h
+++ b/include/linux/mm.h
@@@ -792,14 -791,10 +792,15 @@@ static inline void unmap_shared_mapping
        unmap_mapping_range(mapping, holebegin, holelen, 0);
  }
  
- extern int vmtruncate(struct inode * inode, loff_t offset);
- extern int vmtruncate_range(struct inode * inode, loff_t offset, loff_t end);
+ extern void truncate_pagecache(struct inode *inode, loff_t old, loff_t new);
+ extern int vmtruncate(struct inode *inode, loff_t offset);
+ extern int vmtruncate_range(struct inode *inode, loff_t offset, loff_t end);
  
 +int truncate_inode_page(struct address_space *mapping, struct page *page);
 +int generic_error_remove_page(struct address_space *mapping, struct page *page);
 +
 +int invalidate_inode_page(struct page *page);
 +
  #ifdef CONFIG_MMU
  extern int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                        unsigned long address, unsigned int flags);

diff --cc mm/filemap.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/truncate.c
Simple merge