24 files changed, 195 insertions, 305 deletions

diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index d453d62ab0c6..08405a3da6b1 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -520,13 +520,10 @@ static inline int ref_for_same_block(struct __prelim_ref *ref1,
 static int __add_missing_keys(struct btrfs_fs_info *fs_info,
                               struct list_head *head)
 {
-        struct list_head *pos;
+        struct __prelim_ref *ref;
         struct extent_buffer *eb;
 
-        list_for_each(pos, head) {
-                struct __prelim_ref *ref;
-                ref = list_entry(pos, struct __prelim_ref, list);
-
+        list_for_each_entry(ref, head, list) {
                 if (ref->parent)
                         continue;
                 if (ref->key_for_search.type)
@@ -563,23 +560,15 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info,
  */
 static void __merge_refs(struct list_head *head, int mode)
 {
-        struct list_head *pos1;
+        struct __prelim_ref *ref1;
 
-        list_for_each(pos1, head) {
-                struct list_head *n2;
-                struct list_head *pos2;
-                struct __prelim_ref *ref1;
+        list_for_each_entry(ref1, head, list) {
+                struct __prelim_ref *ref2 = ref1, *tmp;
 
-                ref1 = list_entry(pos1, struct __prelim_ref, list);
-
-                for (pos2 = pos1->next, n2 = pos2->next; pos2 != head;
-                     pos2 = n2, n2 = pos2->next) {
-                        struct __prelim_ref *ref2;
+                list_for_each_entry_safe_continue(ref2, tmp, head, list) {
                         struct __prelim_ref *xchg;
                         struct extent_inode_elem *eie;
 
-                        ref2 = list_entry(pos2, struct __prelim_ref, list);
-
                         if (!ref_for_same_block(ref1, ref2))
                                 continue;
                         if (mode == 1) {
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index 0340c57bf377..861d472564c1 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -531,13 +531,9 @@ static struct btrfsic_block *btrfsic_block_hashtable_lookup(
             (((unsigned int)(dev_bytenr >> 16)) ^
              ((unsigned int)((uintptr_t)bdev))) &
              (BTRFSIC_BLOCK_HASHTABLE_SIZE - 1);
-        struct list_head *elem;
-
-        list_for_each(elem, h->table + hashval) {
-                struct btrfsic_block *const b =
-                    list_entry(elem, struct btrfsic_block,
-                               collision_resolving_node);
+        struct btrfsic_block *b;
 
+        list_for_each_entry(b, h->table + hashval, collision_resolving_node) {
                 if (b->dev_state->bdev == bdev && b->dev_bytenr == dev_bytenr)
                         return b;
         }
@@ -588,13 +584,9 @@ static struct btrfsic_block_link *btrfsic_block_link_hashtable_lookup(
              ((unsigned int)((uintptr_t)bdev_ref_to)) ^
              ((unsigned int)((uintptr_t)bdev_ref_from))) &
              (BTRFSIC_BLOCK_LINK_HASHTABLE_SIZE - 1);
-        struct list_head *elem;
-
-        list_for_each(elem, h->table + hashval) {
-                struct btrfsic_block_link *const l =
-                    list_entry(elem, struct btrfsic_block_link,
-                               collision_resolving_node);
+        struct btrfsic_block_link *l;
 
+        list_for_each_entry(l, h->table + hashval, collision_resolving_node) {
                 BUG_ON(NULL == l->block_ref_to);
                 BUG_ON(NULL == l->block_ref_from);
                 if (l->block_ref_to->dev_state->bdev == bdev_ref_to &&
@@ -639,13 +631,9 @@ static struct btrfsic_dev_state *btrfsic_dev_state_hashtable_lookup(
         const unsigned int hashval =
             (((unsigned int)((uintptr_t)bdev)) &
              (BTRFSIC_DEV2STATE_HASHTABLE_SIZE - 1));
-        struct list_head *elem;
-
-        list_for_each(elem, h->table + hashval) {
-                struct btrfsic_dev_state *const ds =
-                    list_entry(elem, struct btrfsic_dev_state,
-                               collision_resolving_node);
+        struct btrfsic_dev_state *ds;
 
+        list_for_each_entry(ds, h->table + hashval, collision_resolving_node) {
                 if (ds->bdev == bdev)
                         return ds;
         }
@@ -1720,29 +1708,20 @@ static int btrfsic_read_block(struct btrfsic_state *state,
 
 static void btrfsic_dump_database(struct btrfsic_state *state)
 {
-        struct list_head *elem_all;
+        const struct btrfsic_block *b_all;
 
         BUG_ON(NULL == state);
 
         printk(KERN_INFO "all_blocks_list:\n");
-        list_for_each(elem_all, &state->all_blocks_list) {
-                const struct btrfsic_block *const b_all =
-                    list_entry(elem_all, struct btrfsic_block,
-                               all_blocks_node);
-                struct list_head *elem_ref_to;
-                struct list_head *elem_ref_from;
+        list_for_each_entry(b_all, &state->all_blocks_list, all_blocks_node) {
+                const struct btrfsic_block_link *l;
 
                 printk(KERN_INFO "%c-block @%llu (%s/%llu/%d)\n",
                        btrfsic_get_block_type(state, b_all),
                        b_all->logical_bytenr, b_all->dev_state->name,
                        b_all->dev_bytenr, b_all->mirror_num);
 
-                list_for_each(elem_ref_to, &b_all->ref_to_list) {
-                        const struct btrfsic_block_link *const l =
-                            list_entry(elem_ref_to,
-                                       struct btrfsic_block_link,
-                                       node_ref_to);
-
+                list_for_each_entry(l, &b_all->ref_to_list, node_ref_to) {
                         printk(KERN_INFO " %c @%llu (%s/%llu/%d)"
                                " refers %u* to"
                                " %c @%llu (%s/%llu/%d)\n",
@@ -1757,12 +1736,7 @@ static void btrfsic_dump_database(struct btrfsic_state *state)
                                l->block_ref_to->mirror_num);
                 }
 
-                list_for_each(elem_ref_from, &b_all->ref_from_list) {
-                        const struct btrfsic_block_link *const l =
-                            list_entry(elem_ref_from,
-                                       struct btrfsic_block_link,
-                                       node_ref_from);
-
+                list_for_each_entry(l, &b_all->ref_from_list, node_ref_from) {
                         printk(KERN_INFO " %c @%llu (%s/%llu/%d)"
                                " is ref %u* from"
                                " %c @%llu (%s/%llu/%d)\n",
@@ -1845,8 +1819,7 @@ again:
                                                &state->block_hashtable);