Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (32 commits)
  ocfs2: recover orphans in offline slots during recovery and mount
  ocfs2: Pagecache usage optimization on ocfs2
  ocfs2: fix rare stale inode errors when exporting via nfs
  ocfs2/dlm: Tweak mle_state output
  ocfs2/dlm: Do not purge lockres that is being migrated dlm_purge_lockres()
  ocfs2/dlm: Remove struct dlm_lock_name in struct dlm_master_list_entry
  ocfs2/dlm: Show the number of lockres/mles in dlm_state
  ocfs2/dlm: dlm_set_lockres_owner() and dlm_change_lockres_owner() inlined
  ocfs2/dlm: Improve lockres counts
  ocfs2/dlm: Track number of mles
  ocfs2/dlm: Indent dlm_cleanup_master_list()
  ocfs2/dlm: Activate dlm->master_hash for master list entries
  ocfs2/dlm: Create and destroy the dlm->master_hash
  ocfs2/dlm: Refactor dlm_clean_master_list()
  ocfs2/dlm: Clean up struct dlm_lock_name
  ocfs2/dlm: Encapsulate adding and removing of mle from dlm->master_list
  ocfs2: Optimize inode group allocation by recording last used group.
  ocfs2: Allocate inode groups from global_bitmap.
  ocfs2: Optimize inode allocation by remembering last group
  ocfs2: fix leaf start calculation in ocfs2_dx_dir_rebalance()
  ...

1 files changed, 12 insertions, 11 deletions

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 8e1709a679b7..b2c52b3a1484 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -1956,15 +1956,16 @@ static int ocfs2_write_end(struct file *file, struct address_space *mapping,
 }
 
 const struct address_space_operations ocfs2_aops = {
-        .readpage       = ocfs2_readpage,
-        .readpages      = ocfs2_readpages,
-        .writepage      = ocfs2_writepage,
-        .write_begin    = ocfs2_write_begin,
-        .write_end      = ocfs2_write_end,
-        .bmap           = ocfs2_bmap,
-        .sync_page      = block_sync_page,
-        .direct_IO      = ocfs2_direct_IO,
-        .invalidatepage = ocfs2_invalidatepage,
-        .releasepage    = ocfs2_releasepage,
-        .migratepage    = buffer_migrate_page,
+        .readpage               = ocfs2_readpage,
+        .readpages              = ocfs2_readpages,
+        .writepage              = ocfs2_writepage,
+        .write_begin            = ocfs2_write_begin,
+        .write_end              = ocfs2_write_end,
+        .bmap                   = ocfs2_bmap,
+        .sync_page              = block_sync_page,
+        .direct_IO              = ocfs2_direct_IO,
+        .invalidatepage         = ocfs2_invalidatepage,
+        .releasepage            = ocfs2_releasepage,
+        .migratepage            = buffer_migrate_page,
+        .is_partially_uptodate  = block_is_partially_uptodate,
 };