Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 5 deletions

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 1744ba8b2754..ae7f64a8facb 100644
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -985,13 +985,14 @@ void btrfs_lock_and_flush_ordered_range(struct extent_io_tree *tree,
                                         struct extent_state **cached_state)
 {
         struct btrfs_ordered_extent *ordered;
-        struct extent_state *cachedp = NULL;
+        struct extent_state *cache = NULL;
+        struct extent_state **cachedp = &cache;
 
         if (cached_state)
-                cachedp = *cached_state;
+                cachedp = cached_state;
 
         while (1) {
-                lock_extent_bits(tree, start, end, &cachedp);
+                lock_extent_bits(tree, start, end, cachedp);
                 ordered = btrfs_lookup_ordered_range(inode, start,
                                                      end - start + 1);
                 if (!ordered) {
@@ -1001,10 +1002,10 @@ void btrfs_lock_and_flush_ordered_range(struct extent_io_tree *tree,
                          * aren't exposing it outside of this function
                          */
                         if (!cached_state)
-                                refcount_dec(&cachedp->refs);
+                                refcount_dec(&cache->refs);
                         break;
                 }
-                unlock_extent_cached(tree, start, end, &cachedp);
+                unlock_extent_cached(tree, start, end, cachedp);
                 btrfs_start_ordered_extent(&inode->vfs_inode, ordered, 1);
                 btrfs_put_ordered_extent(ordered);
         }