Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus

Conflicts:
	fs/btrfs/ulist.h

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --cc fs/btrfs/ctree.c
Simple merge

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/extent-tree.c
Simple merge

diff --cc fs/btrfs/extent_io.c
index b3692c1373aa5e803882dbb8f54163865040cdeb,3daed70a401abe7d5cc8b0bdaee4a976a2a2760a..2c8f7b2046173954f720125a6e53e96de3c7727e
--- 1/fs/btrfs/extent_io.c
--- 2/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -3975,8 -4036,8 +4030,9 @@@ static void btrfs_release_extent_buffer
                                                unsigned long start_idx)
  {
        unsigned long index;
 +      unsigned long num_pages;
        struct page *page;
+       int mapped = !test_bit(EXTENT_BUFFER_DUMMY, &eb->bflags);
  
        BUG_ON(extent_buffer_under_io(eb));
  

diff --cc fs/btrfs/extent_io.h
Simple merge

diff --cc fs/btrfs/ioctl.c
Simple merge

diff --cc fs/btrfs/transaction.c
Simple merge

diff --cc fs/btrfs/ulist.c
index ad993bc2df93eb3d5b0cef4473c09ef96591bc5d,2ef59400ad6eb38bef17d3967f33fb46dd4287ac..ab942f46b3dd81e06348c4950901f3e4eef87016
--- 1/fs/btrfs/ulist.c
--- 2/fs/btrfs/ulist.c
+++ b/fs/btrfs/ulist.c
@@@ -144,7 -144,13 +144,13 @@@ EXPORT_SYMBOL(ulist_free)
   * unaltered.
   */
  int ulist_add(struct ulist *ulist, u64 val, unsigned long aux,
 -            unsigned long gfp_mask)
 +            gfp_t gfp_mask)
+ {
+       return ulist_add_merge(ulist, val, aux, NULL, gfp_mask);
+ }
+ 
+ int ulist_add_merge(struct ulist *ulist, u64 val, unsigned long aux,
 -                  unsigned long *old_aux, unsigned long gfp_mask)
++                  unsigned long *old_aux, gfp_t gfp_mask)
  {
        int i;
  

diff --cc fs/btrfs/ulist.h
index 6568c3527732e2f83fce5d99ac2112f716ffd1a5,f1b1bf00c5a93fb1add21da0e8dd1cbbdd2ba448..21bdc8ec813046ac56e3c7db0739bcdba7ac188a
--- 1/fs/btrfs/ulist.h
--- 2/fs/btrfs/ulist.h
+++ b/fs/btrfs/ulist.h
@@@ -59,9 -63,15 +63,15 @@@ struct ulist 
  void ulist_init(struct ulist *ulist);
  void ulist_fini(struct ulist *ulist);
  void ulist_reinit(struct ulist *ulist);
 -struct ulist *ulist_alloc(unsigned long gfp_mask);
 +struct ulist *ulist_alloc(gfp_t gfp_mask);
  void ulist_free(struct ulist *ulist);
- int ulist_add(struct ulist *ulist, u64 val, unsigned long aux, gfp_t gfp_mask);
- struct ulist_node *ulist_next(struct ulist *ulist, struct ulist_node *prev);
+ int ulist_add(struct ulist *ulist, u64 val, unsigned long aux,
 -            unsigned long gfp_mask);
++            gfp_t gfp_mask);
+ int ulist_add_merge(struct ulist *ulist, u64 val, unsigned long aux,
 -                  unsigned long *old_aux, unsigned long gfp_mask);
++                  unsigned long *old_aux, gfp_t gfp_mask);
+ struct ulist_node *ulist_next(struct ulist *ulist,
+                             struct ulist_iterator *uiter);
+ 
+ #define ULIST_ITER_INIT(uiter) ((uiter)->i = 0)
  
  #endif