From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932104AbdBKNTV (ORCPT ); Sat, 11 Feb 2017 08:19:21 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:54088 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753487AbdBKNTS (ORCPT ); Sat, 11 Feb 2017 08:19:18 -0500 Date: Sat, 11 Feb 2017 08:18:50 -0500 From: Chris Mason To: Linus Torvalds , Linux Kernel Mailing List , linux-btrfs Subject: [GIT PULL] Btrfs Message-ID: <20170211131848.GB65294@clm-mbp.thefacebook.com> Mail-Followup-To: Chris Mason , Linus Torvalds , Linux Kernel Mailing List , linux-btrfs MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Originating-IP: [2620:10d:c091:180::1:d6bd] X-ClientProxiedBy: MWHPR09CA0002.namprd09.prod.outlook.com (10.173.97.12) To DM5PR15MB1243.namprd15.prod.outlook.com (10.173.209.137) X-MS-Office365-Filtering-Correlation-Id: cb057307-c5f6-4cb3-66bb-08d452808993 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DM5PR15MB1243; X-Microsoft-Exchange-Diagnostics: 1;DM5PR15MB1243;3:QfOw/J/z+eRun1eKAz2/pkI4AHqyxZ134xfjvJlVFAH6E8vuKeRvOOm/dOdkwQXVYMKvBlB2+NLsSzlGhfeL54nAvHMyCGTGb2LlWY653Sn9HSY0MOChmA48nzIMjcaHSuCKxLyZPpsG6gXL80qVoKXFPmlhEkWRNM4YNPA2gZ365tTDSmvnRAhrH67F1fD/dzRBMqVnQsmveWhfSyit/LTAeiVxmEHTMQM4Hv2xpxPC4VIgWy+quaKkM8vRF+ABHs51MYL+fztbTaaY+ekOkQ==;25:VY4lfxnOQQ4GwfjvAQPGCS7essef14uRPy7/nQvEPEDM/btc7GpqgxkW8gCPEjLsar2BDS8J1AlQrWBat7g4mipQD8kbSlKAgdfil3O03rZ8RpOGdmwiAuNokJ+kgEdKAeUKpBD3BGqkCAQsFTMBpt2klTXh7dvBLC6ntmOpseOKMvjIJjHXOACQIALWM03/3BV7paMA4xnNNqvKzSEXcK7rlbsuwHQua8hYzYFVDwKexNSzz8sqhJJBkJmFUa9K2nV/NycWWHJC6a7g4Oh/nzKqPyfNTHFRi9IQAC3x4QXd+YJ1xTTcUagELUVDy5vCSzaotS8HM8dgzE6I7nvjVgcrOHqahGlIzlrnaCCxVPqGFu6SrKr8EbQlDEM3nvIPRVzKCfAYte8Y3NW86Ag3tI5PWwnVWrQeRyrevHnLybTDlrt2lghOBgW4sy78eh9FAMGy4h8Lq/1E2a0DeISl+A== X-Microsoft-Exchange-Diagnostics: 1;DM5PR15MB1243;31:L7ja5f2liEjbohCbOYckVS3KVEeJ3R+ZSfa/w/yxP+1BO3Mu/MKCYuLlcN372fKm23j4OQrAZzYaCbW2GQGZZFeMEwzQaslULBvXGQDC/wkT1Ma/eYFUq1v2Glq/8pn0Okb3VEWC6sc3Cjd8IoFJmaHHQhhvvppCrFmXrgBUblIO9GSz6ANG4WCelr0H9COYcL1wajTGY0KcbnFCEjGouw6R82/r2ih1YeVDBlyFpwEegzT66wdmMTq+LHU5lRTwJHzLjUpw11+0Pqb+GYf6QaYnX7XqKjQAMF9yqlf7Tb8=;20:QE3fBWT7GG0liPOwfy8pbCYvMAu3/C1uVxPMisXECUN997MTSV04ZTJH5HDglA4iLlgbSjD/W9mVfuIcOSzw/+apLIHf6FwfSljrsXNVbsmp/DlaPK/aIKV0qwEsLGNx+wt2Za2XqkS30RJb0S3EuKj5ROKcqov4K91M/QrXbOyOA6o4ieXbo30woNWwiW3DRIua0fNBBLZ5skcuaL+uptkWkZCBY4wnkQVK8vWBiKywffqitwAPOJTr9PiYQU7HmVjBa4TOgrYqldjI04yQ5LSHe/2Uq2gPpOUvTdlAzf0wno+SYm9hnKoF/k56v27BtrU7nWSYjLgRNigmvijzMScz4pJbs3w/wYbtgurO0lq8Ju4LgbMFtTathRi+rfRHykjTvcBSYc61wNK1OpsiqLVzBB0479XN8ciQ+0eqcr0OVirjAMbzusDtAhmwfsKVkD7YrDQ1630cQ1hmTEq1q/yT8jjio/guV0Pba3qh6k+ZoxchBiyOCBiTJEWLAtLR X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(84791874153150); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123560025)(20161123558025)(20161123555025)(20161123562025)(20161123564025)(6072148);SRVR:DM5PR15MB1243;BCL:0;PCL:0;RULEID:;SRVR:DM5PR15MB1243; X-Microsoft-Exchange-Diagnostics: 1;DM5PR15MB1243;4:wujlyOpL2Gkooizl1DGTAughqshES1rY+lf4OEe4GXnhVUhEKnPUS6WDISudUV8w1wuAL3//bIPw7TwYSKknXed8Efv3FCr/oCTlKnYS8gcfYbUnOzTByYyQB+Z4awz0X9uPWmwVPFtY8OiKHZ8cxbMvQ3vtQHPXfzlawKxwBlMqZFsYjU2EwvByn46vizas8psayrq4Z3j7NGsazLp+3Nkt8SEeZ+jF7Bet/T5a1FjFHJx44UEwOp31uJBTS7x3iHmalrvxnFCI5Nu0c0x2NfKVVt6dS0FbF1AfZ3FjzbdOGbUH7oTQ/hTPLw4IElqPcFaLI9ZTZDgPSR9OJsHtApkLgA83qo0GjsxX8hi9mowzoEE+RmN2RRGF+oTXBbnXbK3Jv1C8X6s5HwnWyQnocZXD38g5nSZiTCgnv0rSd/2HEKFlmJ3424qDj7acXb6L4dr8F2yxQMq7s0pLFDmwVp7swStC3K9YIfTiMKtwukH+ZFm1USFVE63L25jE9gMF7BBLGr47SsQrEiDZxR7BsCaS23JNLOp8qObvW8F6JiKkVQDcNDc44SDdKVrk8AbSlzcDZXrQW+SxucwhCdzYv/nk5Rv+ANFIXUVePPdpHzk3E/Qd75KxT0lKs3qzeVfHmnb5TKtThfBQGpLKWBmLjw== X-Forefront-PRVS: 0215D7173F X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(7916002)(39450400003)(39410400002)(39830400002)(189002)(199003)(55016002)(9686003)(25786008)(53416004)(6506006)(105586002)(42186005)(106356001)(33656002)(68736007)(54356999)(101416001)(50986999)(38730400002)(69596002)(53936002)(97756001)(46406003)(8676002)(81166006)(81156014)(50466002)(2906002)(23726003)(1076002)(4001350100001)(189998001)(97736004)(92566002)(47776003)(6116002)(6666003)(7736002)(305945005)(5660300001)(83506001)(86362001)(18370500001)(17423001)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR15MB1243;H:clm-mbp.thefacebook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM5PR15MB1243;23:V1fIiM6PhBxRt243Vdswq4zEG9yTcVAFMCHPB6BS6?= =?us-ascii?Q?V0TIWawH0YTF7KBW3PxhdJtV5jwBvXcCIg+p6oMD+EnAiIXFxZlTvZedba2S?= =?us-ascii?Q?db6nX9eWQYsGPZaAge8igQOqJZbmZllSplb31uBihZntwx0V6OulG9oSm4V3?= =?us-ascii?Q?a7YqY159z4ZgB+3XnMt88/2Ow2S6DvrLt1SVqy8+eOUW0E1nvKW8Q5KF9FNl?= =?us-ascii?Q?UKwgTyTwdgj/ppD56cc2noEVieVR9vhXXtJ/PpZ/La3wWaIru1eu8NMP8nu4?= =?us-ascii?Q?UZDMwdIE76E0KnhuLAvA3r4XkH77pG/E0zcNvv9DWArMxDGOSGaoII9EVwqR?= =?us-ascii?Q?CweFzB5pV7W+FIE+N5KXYPW4/S0Gt4NzfTJGnDNvv3RvLRpoBg6QELYBoO/J?= =?us-ascii?Q?RnUj+cJNiP7kWN0vOfpKJAmV5hA5/Ww4B4gSkUcs3phYOusGMezUfJRenDc9?= =?us-ascii?Q?pDvgKkcWfKw3i3shqm0eqyUc8PzYhKC2SS4h/jDLS8he3rZfbZwFaucoZkDO?= =?us-ascii?Q?eMjSTiJ0UTy+0sXbxDt7gA/25qXv+RALcAzsmgH/fHjEZ7nFvudpa4STC8L8?= =?us-ascii?Q?OSUlxYTQWGe3Ivz73iLnnMG8aXqPMOOlQWe1bJ+sV8JLqKvFV1FHRBjEy2PO?= =?us-ascii?Q?aeHm+nrc1mt/mbVNvLW6igivLIIInR7rL11Vt/pXjJYNR7yf5/PrkZDN2sI1?= =?us-ascii?Q?LPiJDObc7DQ3gpRQ1/YyQLFppEVBfaT7JsLBfliMBhei79H8ip8XnSer3XsY?= =?us-ascii?Q?qJ0Fyp438vvQg23ZpuwWb7ve2HVO2Rnjd915kY3EDKSS33oUip+O/WW43AF+?= =?us-ascii?Q?soQuXNtOViv/avbF4fo1e+yyA1g2RgnHUgtPbMoyS1b4N/LYamh0H7C8o3kJ?= =?us-ascii?Q?0VxV98IV3pgIAyIeNj0VNcrjZa0WIwoasjzNhbNDYeHlqdnAiEOK+VwVJLqV?= =?us-ascii?Q?h9WshPizuzsDvnjNsdbvLt01RgDMZqsZx7npq/0m50dx13eUUxcvTNwQwAw8?= =?us-ascii?Q?b6c441x9uX393vEB54Tht8f5PAr/V400Ppzc2Iiq+5bqRiHE4bQ++CqL8XIo?= =?us-ascii?Q?ArgsDLO8NlRZT5TXXS4Tcg3Kn3lpYjgdGPhRR7NLji607RUm6IAgOc8dlyEl?= =?us-ascii?Q?+sVAesgXUXLcFoSiPeLe26iqxffcobXN5FOucGDjuSyCgKKixxyTIE2iJmP5?= =?us-ascii?Q?0OIjarno3LxGQ8=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR15MB1243;6:dHxEu+UzN8RxW40w8aFmJLcOXnBA4r+Ps4gZdk6euzVrQNrBdSRVGdPktylm3M4pM0HPaldjZc+KvvxydVxalu6oD2DnKMyV8ID3tGuz4WkXOp+7aW1QZZFX5OwUHy9o+7wvps9syo+LsAar9COTNj79Dw+sBQwJfQY04diq+2Ze8NML4k5HJhzyEpRxQAgW7Tn5avJ5nBhNOMvyqozeDQYdZNnZ282qpcWws6+9tNQw9Pg3EtEguRIW7AF7tSgwFcVjOnWd1G4h5EBp8oJmgvEyG6jTnzdbbA3cl6ob1C4P6mptX3jd+Kh3YMbGDqnPb+S14cZHDpn6ELwW5PbYQgMKpB8H+QR7eosnjY+nTU5P1vopO5691LQHMDtJgoTUhd3Ilnop0LtwDvUCwMD+Ig==;5:b7qcK/KF2Dk+MolVATIzfKQ5N3/gOJ1YC5ZeZQqFvSIwy1+GGHERRrjFYa/MYLSHfbGj0OjBL2AAavwx2rZQxUI5LKH3neT5NmtDvn7r48nQde7wEVlbEg7CNQ6ADqWyR1U22ttIrJx/HuWuc6Dktg==;24:k3G+gSycn4dBit9M3MNcTtVEwD4kNQ4OA8GLiYw06bXzdS/kx9I/YtSNU4ye5dcloD1ByHFvvKGnDHZV6S9mZ1V3FoYUAKNcmKKecBjEBwo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM5PR15MB1243;7:YD7B30X74yMsdddpm8Kp4Cs4KkZY9iMl5cMXqFdZEEOf/m4mrWovPccbtwFmn4dNCwufs7Hhe4MZ5Q7uTWI2H6xgdlyI9o/PqAnVEmgbnsGNWf15/1iUih5Z0K/Pb4l4dOr8I0xeEbF4hH1d/oEle83G6YHbcBoMAkSiOUDXEHu6Su9Wow+5CbVNXDkv+6YZ+H10Zf7vZJOGZMansIppbJHCmReCm7I5F00+9B3oU1eJRW4WnHhkOMOzoO2KT56rmjjBtaMG6ITzzi5hz5N/5xW322xB4BNcg3NpWh7ECR3Fw01NkJi/VWrn96Ju4kBxG8aeJySAYCZAPqkiFRCa36n4tbqxyBshlN6TSQiIfRPqLGHhRLYYSDcPt5WzG+VnAAR45r9ZW7g3i2EMh9Cyhx1s5j4BZUggX2RA9O+8y5lE9bJRPnTyJPv/6MeTVZt/NQR6IRacPiWJBuKoV8PUW+Fjc9TvYKHrj34v2zG+mnknWJXxMdbODPIsiT3QqJZ7fCVdPmw2LoXSSZ7LGxOnsQ==;20:/dEujLVRinriOXlOz9KOxIxDr4RbKJWpjvceLyd4AzTfELhsjrE3v0ITZcjjOQhG8Yg/JvDUiFaVQ5XRyYph0dfStpJY3Wv+YUfs8Ij2JQpKrT4JI309uG72KMlyWBITBxPMUYc9aJrFXWFTiFPYQ+AvaofuJZt5dFbUIvu4rzw= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2017 13:18:57.3664 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR15MB1243 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-02-11_10:,, 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.10 branch: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus-4.10 Has two last minute fixes. The highest priority here is a regression fix for the decompression code, but we also fixed up a problem with the 32 bit compat ioctls. The decompression bug could hand back the wrong data on big reads when zlib was used. I have a larger cleanup to make the math here less error prone, but at this stage in the release Omar's patch is the best choice. Omar Sandoval (1) commits (+24/-15): Btrfs: fix btrfs_decompress_buf2page() Jeff Mahoney (1) commits (+4/-2): btrfs: fix btrfs_compat_ioctl failures on non-compat ioctls Total: (2) commits (+28/-17) fs/btrfs/compression.c | 39 ++++++++++++++++++++++++--------------- fs/btrfs/ioctl.c | 6 ++++-- 2 files changed, 28 insertions(+), 17 deletions(-)