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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: stop calling filemap_fdatawait inside ->fsync
  fix readahead calculations in xfs_dir2_leaf_getdents()
  xfs: make sure xfs_sync_fsdata covers the log
  xfs: mark inodes dirty before issuing I/O
  xfs: cleanup ->sync_fs
  xfs: fix xfs_quiesce_data
  xfs: implement ->dirty_inode to fix timestamp handling

diff --cc fs/xfs/linux-2.6/xfs_aops.c
Simple merge

diff --cc fs/xfs/linux-2.6/xfs_file.c
Simple merge

diff --cc fs/xfs/linux-2.6/xfs_super.c
index bdd41c8c342ff7b052de193a998076d00b62667b,eefea0d9d03d6c92b1d8edd2a0846b3b438092fc..18a4b8e11df2d4241bcfafd59297c30e961241ad
--- 1/fs/xfs/linux-2.6/xfs_super.c
--- 2/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@@ -1536,9 -1558,10 +1558,10 @@@ xfs_fs_get_sb
                           mnt);
  }
  
 -static struct super_operations xfs_super_operations = {
 +static const struct super_operations xfs_super_operations = {
        .alloc_inode            = xfs_fs_alloc_inode,
        .destroy_inode          = xfs_fs_destroy_inode,
+       .dirty_inode            = xfs_fs_dirty_inode,
        .write_inode            = xfs_fs_write_inode,
        .clear_inode            = xfs_fs_clear_inode,
        .put_super              = xfs_fs_put_super,