Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Fix inode size update before data write in xfs_setattr
  [XFS] Allow punching holes to free space when at ENOSPC
  [XFS] Implement ->page_mkwrite in XFS.
  [FS] Implement block_page_mkwrite.

Manually fix up conflict with Nick's VM fault handling patches in
fs/xfs/linux-2.6/xfs_file.c

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --cc fs/xfs/linux-2.6/xfs_file.c
index 2d4be2f247b24cfc69efce59a0315f849feafebb,b4c936485d114cba279c6c8ece68778eedc6c149..0d4001eafd16861daf44ef05ea0ee7200388dbf7
--- 1/fs/xfs/linux-2.6/xfs_file.c
--- 2/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@@ -464,12 -478,16 +478,14 @@@ const struct file_operations xfs_dir_fi
  };
  
  static struct vm_operations_struct xfs_file_vm_ops = {
 -      .nopage         = filemap_nopage,
 -      .populate       = filemap_populate,
 +      .fault          = filemap_fault,
+       .page_mkwrite   = xfs_vm_page_mkwrite,
  };
  
  #ifdef CONFIG_XFS_DMAPI
  static struct vm_operations_struct xfs_dmapi_file_vm_ops = {
 -      .nopage         = xfs_vm_nopage,
 -      .populate       = filemap_populate,
 +      .fault          = xfs_vm_fault,
+       .page_mkwrite   = xfs_vm_page_mkwrite,
  #ifdef HAVE_VMOP_MPROTECT
        .mprotect       = xfs_vm_mprotect,
  #endif