From patchwork Wed Oct 5 22:25:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Maggard X-Patchwork-Id: 9363537 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 52C30600C8 for ; Wed, 5 Oct 2016 22:25:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5AC528D02 for ; Wed, 5 Oct 2016 22:25:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D64E028D07; Wed, 5 Oct 2016 22:25:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60EF928D02 for ; Wed, 5 Oct 2016 22:25:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941749AbcJEWZ1 (ORCPT ); Wed, 5 Oct 2016 18:25:27 -0400 Received: from mail-qt0-f182.google.com ([209.85.216.182]:33183 "EHLO mail-qt0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941610AbcJEWZZ (ORCPT ); Wed, 5 Oct 2016 18:25:25 -0400 Received: by mail-qt0-f182.google.com with SMTP id s49so819962qta.0 for ; Wed, 05 Oct 2016 15:25:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=4T0WdqHIj3+/HOf0DPvB8yJ4fUC38PUT+S3DIUaE574=; b=OWSLdnl25Cu7+A8oJ3x8ToBcs+6vZv513b18M7qlACQV0CXHiyNTLALRGhrQsxkiGO y6pZEK6f7d5wr8rOY+Va8ZODumlxaCHevdC+JDL+oJRbEO8by7HFCSf6kQCI+BryhUPC dFcyQCi6HE6YmFbtmk8lTmAZSnRjFae3AmofkKjt+Di0TGxqlQD7OFFOs9S7iJ+RY9Gj PiHq09EfPGR1xPgqIKWCVnura5wHg/dVCuSGobDEwxgZ01AzTsJ9tWBqMoCAKqx3socw qDHkXHb1eGIcoZ2aHNJHUkxVvsemR2k0yctT/Fq7/LMDc/u17D/HrD4cJxEY5o5qQJ3P PsbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=4T0WdqHIj3+/HOf0DPvB8yJ4fUC38PUT+S3DIUaE574=; b=Lgp+io5klzhZ8KhnK7uUG6Kx1KCbpL1O/lT7tPd/d1S98VzSheokd0biAnmj541J1F V49xsaT/qHZwA2hx/nPUN+R8h8yUTWDDX5vSZNhQAwsFz75Kf0itsIuwAGJkvNzLlBZH hFNIHJh67/pMMHK4dHTRTFP/9dJVnNJQPY3hvGpkOyGQCfWUxcyBozvkxcWPBK95FUeN 3tLE8gyw3pUVFxajLSJpc2JUYgNaydyrxQAY/UqBVeUTRl15mgcrHGD8hu4SFKowwGPM AQUMTMcydUUQJrkcWytmY5t9+nVZpZJXgnSU3DTf2hQitlg/yy4fiXQr6pOIHvOACcNG /6aA== X-Gm-Message-State: AA6/9RmOwjFmrT9kR6lu0EMsN2R2JC11/pOxn0MxvIrzzyqM5g45b0Oqr2wZBMR9ukt3qaXWK0Yl2j6KC5TmiQ== X-Received: by 10.237.34.122 with SMTP id o55mr11974223qtc.15.1475706324325; Wed, 05 Oct 2016 15:25:24 -0700 (PDT) MIME-Version: 1.0 Received: by 10.237.36.150 with HTTP; Wed, 5 Oct 2016 15:25:23 -0700 (PDT) In-Reply-To: <20161005133346.GF6576@twin.jikos.cz> References: <20161005112949.8086-1-dsterba@suse.com> <20161005133346.GF6576@twin.jikos.cz> From: Justin Maggard Date: Wed, 5 Oct 2016 15:25:23 -0700 Message-ID: Subject: Re: Btrfs progs release 4.8 (32bit builds broken) To: dsterba@suse.cz, David Sterba , BTRFS , Chris Mason Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I saw a 32-bit build failure, but it looked like a legitimate bug, unrelated to the compiler version. Here's the trivial fix: -Justin On Wed, Oct 5, 2016 at 6:33 AM, David Sterba wrote: > I got a report that the 32bit builds are broken. This seems to be caused > by padding inserted (or not) into the structures and depends on a > compiler version. The error messages may look cryptic, but if you see > something like > > ioctl.h:570:1: note: in expansion of macro 'BUILD_ASSERT' > BUILD_ASSERT(sizeof(struct btrfs_ioctl_received_subvol_args) == 200); > > that means that the given structure has an unexpected size. Fixing that > properly will probably lead to some tricks to force the exact size > regardless of arch bits and compiler. > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html --- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/ioctl.h b/ioctl.h index a7235c0..26a3a5a 100644 --- a/ioctl.h +++ b/ioctl.h @@ -606,7 +606,7 @@ struct btrfs_ioctl_send_args { * Size of structure depends on pointer width, was not caught. Kernel handles * pointer width differences transparently */ -BUILD_ASSERT(sizeof(__u64 *) == 8 +BUILD_ASSERT(sizeof(__u64) == 8 ? sizeof(struct btrfs_ioctl_send_args) == 72 : (sizeof(void *) == 4 ? sizeof(struct btrfs_ioctl_send_args) == 68