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)
  [PATCH] ocfs2: zero_user_page conversion
  ocfs2: Support xfs style space reservation ioctls
  ocfs2: support for removing file regions
  ocfs2: update truncate handling of partial clusters
  ocfs2: btree support for removal of arbirtrary extents
  ocfs2: Support creation of unwritten extents
  ocfs2: support writing of unwritten extents
  ocfs2: small cleanup of ocfs2_write_begin_nolock()
  ocfs2: btree changes for unwritten extents
  ocfs2: abstract btree growing calls
  ocfs2: use all extent block suballocators
  ocfs2: plug truncate into cached dealloc routines
  ocfs2: simplify deallocation locking
  ocfs2: harden buffer check during mapping of page blocks
  ocfs2: shared writeable mmap
  ocfs2: factor out write aops into nolock variants
  ocfs2: rework ocfs2_buffered_write_cluster()
  ocfs2: take ip_alloc_sem during entire truncate
  ocfs2: Add "preferred slot" mount option
  [KJ PATCH] Replacing memset(<addr>,0,PAGE_SIZE) with clear_page() in fs/ocfs2/dlm/dlmrecovery.c
  ...

1 files changed, 3 insertions, 38 deletions

diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c
index ba2b2ab1c6e4..03c1d365c78b 100644
--- a/fs/ocfs2/extent_map.c
+++ b/fs/ocfs2/extent_map.c
@@ -109,17 +109,14 @@ static int ocfs2_extent_map_lookup(struct inode *inode, unsigned int cpos,
  */
 void ocfs2_extent_map_trunc(struct inode *inode, unsigned int cpos)
 {
-        struct list_head *p, *n;
-        struct ocfs2_extent_map_item *emi;
+        struct ocfs2_extent_map_item *emi, *n;
         struct ocfs2_inode_info *oi = OCFS2_I(inode);
         struct ocfs2_extent_map *em = &oi->ip_extent_map;
         LIST_HEAD(tmp_list);
         unsigned int range;
 
         spin_lock(&oi->ip_lock);
-        list_for_each_safe(p, n, &em->em_list) {
-                emi = list_entry(p, struct ocfs2_extent_map_item, ei_list);
-
+        list_for_each_entry_safe(emi, n, &em->em_list, ei_list) {
                 if (emi->ei_cpos >= cpos) {
                         /* Full truncate of this record. */
                         list_move(&emi->ei_list, &tmp_list);
@@ -136,8 +133,7 @@ void ocfs2_extent_map_trunc(struct inode *inode, unsigned int cpos)
         }
         spin_unlock(&oi->ip_lock);
 
-        list_for_each_safe(p, n, &tmp_list) {
-                emi = list_entry(p, struct ocfs2_extent_map_item, ei_list);
+        list_for_each_entry_safe(emi, n, &tmp_list, ei_list) {
                 list_del(&emi->ei_list);
                 kfree(emi);
         }
@@ -377,37 +373,6 @@ out:
         return ret;
 }
 
-/*
- * Return the index of the extent record which contains cluster #v_cluster.
- * -1 is returned if it was not found.
- *
- * Should work fine on interior and exterior nodes.
- */
-static int ocfs2_search_extent_list(struct ocfs2_extent_list *el,
-                                    u32 v_cluster)
-{
-        int ret = -1;
-        int i;
-        struct ocfs2_extent_rec *rec;
-        u32 rec_end, rec_start, clusters;
-
-        for(i = 0; i < le16_to_cpu(el->l_next_free_rec); i++) {
-                rec = &el->l_recs[i];
-
-                rec_start = le32_to_cpu(rec->e_cpos);
-                clusters = ocfs2_rec_clusters(el, rec);
-
-                rec_end = rec_start + clusters;
-
-                if (v_cluster >= rec_start && v_cluster < rec_end) {
-                        ret = i;
-                        break;
-                }
-        }
-
-        return ret;
-}
-
 int ocfs2_get_clusters(struct inode *inode, u32 v_cluster,
                        u32 *p_cluster, u32 *num_clusters,
                        unsigned int *extent_flags)