From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Dec 2010 19:08:13 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Tag: v2.6.37-rc6~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e13cf63f2bbd38721af557f0205da994ea068427;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: prevent RAID level downgrades when space is low
  Btrfs: account for missing devices in RAID allocation profiles
  Btrfs: EIO when we fail to read tree roots
  Btrfs: fix compiler warnings
  Btrfs: Make async snapshot ioctl more generic
  Btrfs: pwrite blocked when writing from the mmaped buffer of the same page
  Btrfs: Fix a crash when mounting a subvolume
  Btrfs: fix sync subvol/snapshot creation
  Btrfs: Fix page leak in compressed writeback path
  Btrfs: do not BUG if we fail to remove the orphan item for dead snapshots
  Btrfs: fixup return code for btrfs_del_orphan_item
  Btrfs: do not do fast caching if we are allocating blocks for tree_root
  Btrfs: deal with space cache errors better
  Btrfs: fix use after free in O_DIRECT
---

e13cf63f2bbd38721af557f0205da994ea068427
diff --cc fs/btrfs/volumes.h
index 2b638b6,a668c01..2740db4
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@@ -42,8 -42,10 +42,9 @@@ struct btrfs_device 
  	int running_pending;
  	u64 generation;
  
 -	int barriers;
  	int writeable;
  	int in_fs_metadata;
+ 	int missing;
  
  	spinlock_t io_lock;