From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Oct 2009 20:29:42 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v2.6.32-rc4~16
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=a372bf8b6a12f23f68e716113ccaea4bf646dd0f

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
---

a372bf8b6a12f23f68e716113ccaea4bf646dd0f
diff --cc fs/xfs/linux-2.6/xfs_super.c
index bdd41c8,eefea0d..18a4b8e
--- a/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,