From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 31 May 2012 20:50:28 +0000 (-0400)
Subject: Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus
X-Git-Tag: Ubuntu-5.0.0-8.9~15921^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1e20932a23578bb1ec59107843574e259b96193f;p=mirror_ubuntu-disco-kernel.git

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>
---

1e20932a23578bb1ec59107843574e259b96193f
diff --cc fs/btrfs/extent_io.c
index b3692c1373aa,3daed70a401a..2c8f7b204617
--- a/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/ulist.c
index ad993bc2df93,2ef59400ad6e..ab942f46b3dd
--- a/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 6568c3527732,f1b1bf00c5a9..21bdc8ec8130
--- a/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