From: Linus Torvalds Date: Fri, 9 Oct 2009 20:29:42 +0000 (-0700) Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a372bf8b6a12f23f68e716113ccaea4bf646dd0f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 bdd41c8c342f,eefea0d9d03d..18a4b8e11df2 --- 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,