From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754119AbdEIR4x (ORCPT ); Tue, 9 May 2017 13:56:53 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:39122 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750805AbdEIR4u (ORCPT ); Tue, 9 May 2017 13:56:50 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=fb.com; To: Linus Torvalds , Linux Kernel Mailing List , linux-btrfs From: Chris Mason Subject: [GIT PULL] Btrfs Message-ID: <88747a65-7407-fcc5-4111-962440c082c8@fb.com> Date: Tue, 9 May 2017 13:56:40 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [2620:10d:c091:180::1:f3f0] X-ClientProxiedBy: CY4PR16CA0019.namprd16.prod.outlook.com (10.172.173.29) To MWHPR15MB1662.namprd15.prod.outlook.com (10.175.140.151) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d7346840-247b-4caa-599d-08d49704c296 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:MWHPR15MB1662; X-Microsoft-Exchange-Diagnostics: 1;MWHPR15MB1662;3:K+oXRK45vJzfrG7Bynes2tmLNUz02V6XW5pKPPdCn0w0oQ3Jc2WUsLCrAkY1OsOwgxIqXbN8ctmQ+im2icV9NzmaQq5EhHLx8G7u6mH8VPRPf8nGCtaGmhc4Qz+lU57i6g/hNX86SvuK2WnsqTtk/2mBr5jd/PLF9PMF3i1QPmcGb/yTmX7MZrHcX8CO62q92uj0N0h1ejR3tlAYjpWpJ2N5pQUYWbpA6u4dFT6Ds23mO6FCrCpY9huZbfksmf3ReyQMdwAm2JHvZMyGsfw/Euwz1d3CJ0CAZlgGSSRjNp4EAp07j0R/RTv/j1i4YtIfCbnMF5HP7b6mVwsZgxtP4w==;25:uvt0JSaGRR/8/Pf8bA71UIct96DyrWWweNY/yYnXXx1g8BhSU+R13ZMitjWjrgTGD8UwBIWGYnYJujTn+ayxapBzwgDDg5/COnNvwLj7s/pglDEEkoa3DRtBnEb4nYGPkJbc8g5+BO/C3NslkoMIwVwnu0hgDDCbf5riqk0npWly5JywGXyaYbCEOraDCoDDKzMrtdFrqRUrGOIL3ef9yPEHswlGg0DZYRaP/cXRq7tuAtWHnH07bIEvki5HhPbBVef1Z7xqBNU1NUkMJg7O22ls+9X/5zEfZytHf0w2tOmahiMSYIUnlZ5L3hDJSFcrWWLOrURi+4wgIKCUNSqBx3WOzu7NYNf0IxiKFNDOECIP4Ei1J0I+SdBCLyaiWr9O+RaC7iAE1CIsypca3aoYe5nbdr6qkKfYPsleayEgIXcgBJbbc1PgW2s1PMANl98iRsPtB0GL2VcIjnDx1qa8lwhpeY51JhFqZazx+RJ1FF8= X-Microsoft-Exchange-Diagnostics: 1;MWHPR15MB1662;31:eBIT6BwYD/UAzAJ9Rvku3U5dKm1Sl0VsMoqWc987k5PdOT1+YcazVVBbozBUUZ/iQIcZg/nru2UcWQLNMal3fCie3AuP3o/iwSj0haGJYtSy5PBd7mZ0iPnsqBHUl9vLdS+DcOhIbEjIZIs77aqkiFNR/kxylmXERAbJh212Vjp3YILfw+4D67sZyTtaE10Aa2XeXCQerSE3mq5erBrndVAD+0JOG0LUGTGbpoy+E1jPAY3d2LY2/gp1aETUak9Kw5tcVxL8QhE7n3xlYQ1sXQ==;20:ZJ82BAZ5MIXEui5lD4XTQMB7Q9si2EBDj1rwyHiaRkiWH1KQCEUj0IeXT0wzU+B+vENB7NNcA7QV7MKE2P9t8IPSSl4o0V88sQG7+jW4dsXCBTFqEUHMLMQjkrmlNbmbHqPqwReEh3vDWFBklwDehwGYOEn6/FypDlyKHrnFdDf9BIgtjSuliKm5BR72mK1w3aEqtqXegPzr+Bt6YC/5S2ihfQVLaj4AvGSVVf62E+rRSYrCarf1AbNBM7uG6iLG0uOQfHNHWubxMumpsZGhSKoWUmZc5e83zajK5VffvpvgFwEpmi3SaHeWqSgf7qZ17bhp1QmA9F7AfaY2h8S9btYsrpgodtgvL6IE9kQMQEb+QZlsQl04tCCjLLYEL41ibesyAmOksA6lsptKetGQDyXhXOOnxlOqT625UzMXwWuAOMq9CfkLLRdVVKBbq00bA7HcHux4zGImxdH5x2tNjrCMQq1OlcIV+jmtWdHlTfT0ZzJPTeTYuQmaIMzyZvDZ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(84791874153150); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(6072148);SRVR:MWHPR15MB1662;BCL:0;PCL:0;RULEID:;SRVR:MWHPR15MB1662; X-Microsoft-Exchange-Diagnostics: 1;MWHPR15MB1662;4:C48R/6ErlFXIGsB6t0TvZStv+nv+yGVACmlnTvK/lGDsdSsdDm6MOSh8tXl3NCDbcJS5zeA62Ji0++ll4wmxuTS0lB+wcmLEC92MjAuF6yJHm/YGznZQV8Ku5uQg+Ya2Im5/w6TsrzRY1BT8k0W//4vL7xY3KEjMTpn/czjGA4wjpq+qqeHRSxhj3u/gMRog0M3eCkJ4gOg3G3S8uGAHYSNKNJx8KHmOvCIjAwzxXuD73eg1fiwYTZbBMNvJHUcD2/I99YbmSkNRFTd72gSVMrk1wdlHLvylTHcECLWGIo/LHnGwuojjy3SJ1A7TUB81QC0qTmoEjTWuysJ4c9S9KqXTAz3irAzAiPgEmnBW90CvfXG3BfCJEmOn83qg5oRO68LwaFLYHojtKn+btWyNMr6eFJVpP2BnSmJ10xNL8OHXRJlzXV5Ro8enY6Qna1WM76qX3h2O4+Z5diGS8UgAqKm5x6C47J8K4hWs9nYuO7Mdt6UGK41H8lS1cgiBQ+aNK10pd5ldHtKtK5o3FWILtsVSPdd5WQ0lwK0u+rOpKcmWVIC6ghQSkwC3OY32oZv+rv0oWpphftQ56B8PJhLARuewoFG8cmYlM7c2KA1z8lJx6WQ8rPcBlMRRPHY69ZRStX1J1JKT/ftac0FwENpUfRArtOJR1+1yuk0y5VEaCUYWyeQdJHQ5IhXm6odyhtxgJBtdtNgSmOHJpBzdcO81J8XGeWaP8dq8hILcy+IJpACdWOiHGd98v/dlTtWKK0KZ/6heUanUSYvS9dPuBVJ6cPOmdQuZYIeJ5qTuckknVcwk8oX/cCzfrSCcoDUmNjPl+39vDQgkMDQNuNNDQe83UbJdA9/r94m52ws4FotIazk= X-Forefront-PRVS: 0302D4F392 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(39840400002)(39450400003)(39400400002)(39410400002)(39850400002)(25786009)(53936002)(305945005)(7736002)(2906002)(83506001)(23676002)(38730400002)(6486002)(65956001)(47776003)(33646002)(5660300001)(36756003)(31696002)(4001350100001)(50986999)(8676002)(54356999)(86362001)(81166006)(6116002)(551934003)(42186005)(230700001)(50466002)(189998001)(6666003)(478600001)(17423001)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHPR15MB1662;H:[IPv6:2620:10d:c0a1:1110::1048];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtNV0hQUjE1TUIxNjYyOzIzOjY1aysyd1MwS3Z6bmFCY0c5T3d3Qm9zOUtB?= =?utf-8?B?cndRclljS282VVdEb2R1OS9ZeXFjSFRSeDN5N0xXd0pPUGNrd05VTVptdGM2?= =?utf-8?B?aHk1QlNqV1phV1BpQjFjanZEN1JNWjJoS2U4cjZnS0lzdXRCdkdZd3I5Mklj?= =?utf-8?B?SzlKOTlKZm1nMXJDM0Qxd1h6UDJCOXprbkFoUWQyUTIwd2hydExReGZpMnM0?= =?utf-8?B?dWJvZjRINFp2cEVoR28vcjRnUnhnNFp2Umttbi9jVXNxWWEyNWUzN0NndVhl?= =?utf-8?B?ZnFCckh3MFRWdXJmSzdHS0Jxd0hjaFFydWl5SzlWMzh1S21yRnBPVjUySlJu?= =?utf-8?B?eTZuSnUvMStHZGk4SmVhb0tCQ2lRMDJMbjZyNnNxZWY1azRLbWxzSjZvdEw2?= =?utf-8?B?Wjg4MjFYVnFEc1JNUEhjcnM2VHRpak5DcWFhcGJmendwT2FUeWxFOXBwd0R5?= =?utf-8?B?YnAyMEMxTTc3aUxzSVlVSXhVZjRST0RraGJPS2FFY0FKTlIrMGZuVmQ1SEJn?= =?utf-8?B?TkRaZXNHc0NhblVzMFBBdWRnenpJMUhTMit3YXN1RnU1WVNHQWcycEhrSy9s?= =?utf-8?B?UkdTMGZIWEFCUkl3TnhoRkM3Q3BKRzRCZ0U5TWpLVnpvSmxDcGdTVThGRVdo?= =?utf-8?B?dXp5c2VBenRsYko5UzZVTE9wTXJDVVFQZUM0MGZRYjBWYXQvdWF4S0VMbEVT?= =?utf-8?B?d0pobndCN2Z5NXhpMElvUWM4T3RUbVVKMm1XV0lRekszajh6Nm42UjVXVzEx?= =?utf-8?B?MUFMekF1RVRpWGYvcURJQ292UjFQYStNWFU4czgzcnBVckVlLy9iZElmV0lh?= =?utf-8?B?OWxrN0FUcDM3UTV6Q25rWGl6bGg1RHZQb2tYd0p6dUdlZlk0NkRHc0M2WWxQ?= =?utf-8?B?bXVaVmdYZ3hYQm9oaFR1VFhxcG82T29uU0VMNDFnTFJQT1N2Q1hBUzBUL3FV?= =?utf-8?B?T0hUV3NUei9NVXdnTE16c1RRanowNVRtTVVJTThnTHJsamFCSXRwSk5pcitW?= =?utf-8?B?Q3RvVDNDcnR5cElWWkkyQUd4b3BVd2pWUG5XdUVoSDFRbDZabWo2OFMwQjRB?= =?utf-8?B?K1p4NDh2OVlUL0JibXFQTWJXekZ4SERITkU2ZzNHdkc1TlpVcUppNFVyT2J0?= =?utf-8?B?L3A4ZE5iZk1FYmRPY1BFNGw4ek5Db0Zvb0s3dXlneCtRU2MrTGV1cTNkbmk2?= =?utf-8?B?Rmhud0VKaEFaK01TN1grSzVHczhxQjlyaC9XdXBTMnk5QkowZytUWnZmdEpW?= =?utf-8?B?TkMxR2gvdHEzUFdjRmU0bDFKM2t2eS82SURlYmxJd25ncWNqTFBHVUI3bWQ5?= =?utf-8?Q?nK2WfJ2+BAbprNqNgG22qvsI6Qybcrtg=3D?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR15MB1662;6:jPMNJmnyjvB6DtfVDheS1Wjgm8h2sRKdAbw0kYhzk6pgZ+Iu1fYmavpasWyx7tgToZw3hEEJZiXcCXXM5ZIY/9Mt0vuF7VVbk6kuCOTrUCIX4/aATYmcDJ2JSBHwYALxaY66CzGrWdWLNO7jGZ/iuwf/WYq/klXRkHDV6jq5wfsDmL6Dn3FQkgYQKHD++8mY52FR2ZVFHI3GgE3dR4d3bosOcHqwdncVQxrPjUc8V2z7XPzLcefIzyzS8fjMN78gjPzG3pziEfZo6J07VydCbJ7pwqlty5/jIZKsQIs2JmtbP9GTAJ7XobUz8Q8vVwFX+Qi6/H0PH8Gh8rLXmVwN22N3cpyozXdjuwUaJP7dmk/mH18YAaG/gDh49WeOyxByEnT9Frj/NVkAEWxdZnT6zJU0YpCCF/qOF6H1M6BHkWBGo+cILUB+YofT6mjJqQDVSvyxPm4SJV3WQO8WF0n70ulrWf4gNQuUKqog3d8asA6qcMmr9uQ4sZNz44lDAQDjGugyCpriaFcivzx+tkX19A==;5:mjeD1WML/lti1MkrISzZ2hCKMyfh6wgOxilGZIwq6jZvCsyx0SEbuvk0WQTdJdkwyyWg9rohZn1pmjz4yDa/+0J7WhNIhKx+zn3p8eUdSi+Mw7+xFXMKpzSMYuK8GUSHSnRbEXWCDWCcxrZScOl5xQ==;24:hdzHMzFGLB2zC1KusuwMLbIAP5OjdQtWkFQgVF1h8RMVuegtYLarMqdvAjjy4rumiLlc44/vKRrIsvg/v0+Ilduan0+YVQH4IyXB0Pu31fw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR15MB1662;7:F080FN8Ad9Jfle2y8vfkZTLfxhlmjXLNBeBPgajlDipRiRGLg9trowZfYL8J0dnMWMnQefZD74pzEwtmDzwnOUElWJV26VRS8Hmp6AEfSybPV0LSGn3PUMfCx1+Q1KHRxj7CrBlXzUEUWoNs8nD8gE6IoIpCTAwQSFgSKVt2tSItLYeCTa9lstKM9j41fQXjHogeDEbYCQkQEfcjS+RUYQ9AgJEDchKUObRx41LETmLJdTC2auheUQ3Dz9p1GBS+cZT52cyv4ibRsOjXhHvL18Ffkb5T/eMArLrr8jp2NOeWycIeaHHwOT92++pP4Ro0Qi1sPemLvutBWV6Bgs71KQ==;20:QHoUHlXWgwtBD3A8nZUYyy+d+xOZizkOqeyeDCisQpp/kONmQRPsehUY059fWC50vZCoLildIyIeCyWM6uTJaRvMAyPWzdMM7PHFr+Es3plL7lMOn/aDArrtRfXFkkXdziCzn7Lnggq9WihS7DyVyi8/EB9jQ/zswOu/uHglFuU= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2017 17:56:46.0003 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR15MB1662 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-05-09_14:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, My for-linus-4.12 branch: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus-4.12 Has fixes and cleanups Dave Sterba collected for the merge window. The biggest functional fixes are between btrfs raid5/6 and scrub, and raid5/6 and device replacement. Some of our pending qgroup fixes are included as well while I bash on the rest in testing. We also have the usual set of cleanups, including one that __btrfs_map_block() much more maintainable, and conversions from atomic_t to refcount_t. Elena Reshetova (16) commits (+141/-135): btrfs: convert btrfs_delayed_ref_node.refs from atomic_t to refcount_t (+14/-12) btrfs: convert btrfs_transaction.use_count from atomic_t to refcount_t (+16/-14) btrfs: convert compressed_bio.pending_bios from atomic_t to refcount_t (+9/-9) btrfs: convert btrfs_caching_control.count from atomic_t to refcount_t (+8/-7) btrfs: convert btrfs_ordered_extent.refs from atomic_t to refcount_t (+11/-11) btrfs: convert btrfs_delayed_item.refs from atomic_t to refcount_t (+10/-10) btrfs: convert btrfs_delayed_node.refs from atomic_t to refcount_t (+16/-16) btrfs: convert btrfs_raid_bio.refs from atomic_t to refcount_t (+9/-10) btrfs: convert scrub_recover.refs from atomic_t to refcount_t (+4/-4) btrfs: convert scrub_parity.refs from atomic_t to refcount_t (+4/-4) btrfs: convert extent_state.refs from atomic_t to refcount_t (+9/-8) btrfs: convert extent_map.refs from atomic_t to refcount_t (+12/-11) btrfs: convert scrub_block.refs from atomic_t to refcount_t (+5/-5) btrfs: convert btrfs_root.refs from atomic_t to refcount_t (+4/-4) btrfs: convert scrub_ctx.refs from atomic_t to refcount_t (+5/-5) btrfs: convert btrfs_bio.refs from atomic_t to refcount_t (+5/-5) Liu Bo (15) commits (+640/-425): Btrfs: do not add extra mirror when dev_replace target dev is not available (+4/-3) Btrfs: introduce a function to get extra mirror from replace (+89/-72) Btrfs: fix wrong failed mirror_num of read-repair on raid56 (+5/-0) Btrfs: set scrub page's io_error if failing to submit io (+6/-2) Btrfs: handle operations for device replace separately (+98/-81) Btrfs: enable repair during read for raid56 profile (+27/-13) Btrfs: separate DISCARD from __btrfs_map_block (+175/-114) Btrfs: remove ASSERT in btrfs_truncate_inode_items (+0/-7) Btrfs: switch to div64_u64 if with a u64 divisor (+7/-7) Btrfs: update scrub_parity to use u64 stripe_len (+4/-4) Btrfs: helper for ops that requires full stripe (+10/-8) Btrfs: create a helper for getting chunk map (+57/-111) Btrfs: update comments in cache_save_setup (+2/-1) Btrfs: add file item tracepoints (+154/-0) Btrfs: convert BUG_ON to WARN_ON (+2/-2) David Sterba (12) commits (+72/-86): btrfs: remove redundant parameter from reada_start_machine_dev (+3/-4) btrfs: remove unused qgroup members from btrfs_trans_handle (+0/-20) btrfs: preallocate radix tree node for global readahead tree (+8/-1) btrfs: sink GFP flags parameter to tree_mod_log_insert_root (+5/-5) btrfs: sink GFP flags parameter to tree_mod_log_insert_move (+5/-5) btrfs: remove local blocksize variable in reada_find_extent (+2/-4) btrfs: remove redundant parameter from btree_readahead_hook (+5/-6) btrfs: drop redundant parameters from btrfs_map_sblock (+6/-9) btrfs: track exclusive filesystem operation in flags (+25/-26) btrfs: remove redundant parameter from reada_find_zone (+3/-3) btrfs: preallocate radix tree node for readahead (+8/-1) btrfs: use clear_page where appropriate (+2/-2) Qu Wenruo (10) commits (+510/-96): btrfs: qgroup: Re-arrange tracepoint timing to co-operate with reserved space tracepoint (+6/-10) btrfs: qgroup: Fix qgroup corruption caused by inode_cache mount option (+18/-7) btrfs: Wait for in-flight bios before freeing target device for raid56 (+21/-0) btrfs: Fix metadata underflow caused by btrfs_reloc_clone_csum error (+39/-12) btrfs: Handle delalloc error correctly to avoid ordered extent hang (+48/-15) btrfs: qgroup: Add trace point for qgroup reserved space (+96/-44) btrfs: Prevent scrub recheck from racing with dev replace (+9/-4) btrfs: scrub: Don't append on-disk pages for raid56 scrub (+0/-4) btrfs: scrub: Introduce full stripe lock for RAID56 (+251/-0) btrfs: scrub: Fix RAID56 recovery race condition (+22/-0) Filipe Manana (5) commits (+192/-41): Btrfs: fix incorrect space accounting after failure to insert inline extent (+4/-2) Btrfs: fix invalid attempt to free reserved space on failure to cow range (+45/-18) Btrfs: send, fix file hole not being preserved due to inline extent (+21/-2) Btrfs: fix extent map leak during fallocate error path (+3/-1) Btrfs: fix reported number of inode blocks (+119/-18) Anand Jain (3) commits (+7/-8): btrfs: use q which is already obtained from bdev_get_queue (+3/-4) btrfs: check if the device is flush capable (+4/-0) btrfs: delete unused member nobarriers (+0/-4) Edmund Nadolski (2) commits (+25/-20): btrfs: provide enumeration for __merge_refs mode argument (+13/-10) btrfs: replace hardcoded value with SEQ_LAST macro (+12/-10) Goldwyn Rodrigues (2) commits (+24/-3): btrfs: qgroups: Retry after commit on getting EDQUOT (+23/-1) btrfs: No need to check !(flags & MS_RDONLY) twice (+1/-2) Chris Mason (1) commits (+2/-2): btrfs: fix the gfp_mask for the reada_zones radix tree Adam Borowski (1) commits (+9/-3): btrfs: fix a bogus warning when converting only data or metadata Deepa Dinamani (1) commits (+2/-1): btrfs: Use ktime_get_real_ts for root ctime Dan Carpenter (1) commits (+15/-26): Btrfs: handle only applicable errors returned by btrfs_get_extent Dmitry V. Levin (1) commits (+2/-0): MAINTAINERS: add btrfs file entries for include directories Hans van Kranenburg (1) commits (+5/-5): Btrfs: consistent usage of types in balance_args Total: (71) commits MAINTAINERS | 2 + fs/btrfs/backref.c | 41 ++- fs/btrfs/btrfs_inode.h | 7 + fs/btrfs/compression.c | 18 +- fs/btrfs/ctree.c | 20 +- fs/btrfs/ctree.h | 34 +- fs/btrfs/delayed-inode.c | 46 +-- fs/btrfs/delayed-inode.h | 6 +- fs/btrfs/delayed-ref.c | 8 +- fs/btrfs/delayed-ref.h | 8 +- fs/btrfs/dev-replace.c | 9 +- fs/btrfs/disk-io.c | 13 +- fs/btrfs/disk-io.h | 4 +- fs/btrfs/extent-tree.c | 35 +- fs/btrfs/extent_io.c | 59 +-- fs/btrfs/extent_io.h | 8 +- fs/btrfs/extent_map.c | 10 +- fs/btrfs/extent_map.h | 3 +- fs/btrfs/file.c | 82 ++++- fs/btrfs/free-space-cache.c | 2 +- fs/btrfs/inode.c | 289 +++++++++++---- fs/btrfs/ioctl.c | 33 +- fs/btrfs/ordered-data.c | 20 +- fs/btrfs/ordered-data.h | 2 +- fs/btrfs/qgroup.c | 102 ++---- fs/btrfs/qgroup.h | 51 ++- fs/btrfs/raid56.c | 38 +- fs/btrfs/reada.c | 37 +- fs/btrfs/root-tree.c | 3 +- fs/btrfs/scrub.c | 331 +++++++++++++++-- fs/btrfs/send.c | 23 +- fs/btrfs/super.c | 3 +- fs/btrfs/tests/btrfs-tests.c | 1 - fs/btrfs/transaction.c | 48 ++- fs/btrfs/transaction.h | 6 +- fs/btrfs/tree-log.c | 2 +- fs/btrfs/volumes.c | 854 +++++++++++++++++++++++-------------------- fs/btrfs/volumes.h | 8 +- include/trace/events/btrfs.h | 187 +++++++++- include/uapi/linux/btrfs.h | 10 +- 40 files changed, 1629 insertions(+), 834 deletions(-)