From: Linus Torvalds Date: Fri, 25 Sep 2015 19:08:41 +0000 (-0700) Subject: Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=03e8f644868f147e021e8660346890e731c2e435;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-linus-4.3' of git://git./linux/kernel/git/mason/linux-btrfs Pull btrfs fixes from Chris Mason: "This is an assorted set I've been queuing up: Jeff Mahoney tracked down a tricky one where we ended up starting IO on the wrong mapping for special files in btrfs_evict_inode. A few people reported this one on the list. Filipe found (and provided a test for) a difficult bug in reading compressed extents, and Josef fixed up some quota record keeping with snapshot deletion. Chandan killed off an accounting bug during DIO that lead to WARN_ONs as we freed inodes" * 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: keep dropped roots in cache until transaction commit Btrfs: Direct I/O: Fix space accounting btrfs: skip waiting on ordered range for special files Btrfs: fix read corruption of compressed and shared extents Btrfs: remove unnecessary locking of cleaner_mutex to avoid deadlock Btrfs: don't initialize a space info as full to prevent ENOSPC --- 03e8f644868f147e021e8660346890e731c2e435