From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Nov 2011 04:03:41 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Tag: v3.2-rc1~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a6662ced4153f6dbcfc40d7225c3cc45416039c;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (114 commits)
  Btrfs: check for a null fs root when writing to the backup root log
  Btrfs: fix race during transaction joins
  Btrfs: fix a potential btrfs_bio leak on scrub fixups
  Btrfs: rename btrfs_bio multi -> bbio for consistency
  Btrfs: stop leaking btrfs_bios on readahead
  Btrfs: stop the readahead threads on failed mount
  Btrfs: fix extent_buffer leak in the metadata IO error handling
  Btrfs: fix the new inspection ioctls for 32 bit compat
  Btrfs: fix delayed insertion reservation
  Btrfs: ClearPageError during writepage and clean_tree_block
  Btrfs: be smarter about committing the transaction in reserve_metadata_bytes
  Btrfs: make a delayed_block_rsv for the delayed item insertion
  Btrfs: add a log of past tree roots
  btrfs: separate superblock items out of fs_info
  Btrfs: use the global reserve when truncating the free space cache inode
  Btrfs: release metadata from global reserve if we have to fallback for unlink
  Btrfs: make sure to flush queued bios if write_cache_pages waits
  Btrfs: fix extent pinning bugs in the tree log
  Btrfs: make sure btrfs_remove_free_space doesn't leak EAGAIN
  Btrfs: don't wait as long for more batches during SSD log commit
  ...
---

6a6662ced4153f6dbcfc40d7225c3cc45416039c
diff --cc fs/btrfs/extent-tree.c
index c9ee0e1,18ea90c..9879bd4
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@@ -3340,13 -3375,12 +3375,13 @@@ static int shrink_delalloc(struct btrfs
  		smp_mb();
  		nr_pages = min_t(unsigned long, nr_pages,
  		       root->fs_info->delalloc_bytes >> PAGE_CACHE_SHIFT);
 -		writeback_inodes_sb_nr_if_idle(root->fs_info->sb, nr_pages);
 +		writeback_inodes_sb_nr_if_idle(root->fs_info->sb, nr_pages,
 +						WB_REASON_FS_FREE_SPACE);
  
  		spin_lock(&space_info->lock);
- 		if (reserved > space_info->bytes_reserved)
- 			reclaimed += reserved - space_info->bytes_reserved;
- 		reserved = space_info->bytes_reserved;
+ 		if (reserved > space_info->bytes_may_use)
+ 			reclaimed += reserved - space_info->bytes_may_use;
+ 		reserved = space_info->bytes_may_use;
  		spin_unlock(&space_info->lock);
  
  		loops++;