From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:33962 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753740AbdERHpy (ORCPT ); Thu, 18 May 2017 03:45:54 -0400 Subject: Patch "initramfs: avoid "label at end of compound statement" error" has been added to the 4.11-stable tree To: torvalds@linux-foundation.org, gregkh@linuxfoundation.org, jrg.otte@gmail.com, shorne@gmail.com, viro@zeniv.linux.org.uk Cc: , From: Date: Thu, 18 May 2017 09:45:38 +0200 Message-ID: <14950935381290@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled initramfs: avoid "label at end of compound statement" error to the 4.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: initramfs-avoid-label-at-end-of-compound-statement-error.patch and it can be found in the queue-4.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 394e4f5d5834b610ee032cceb20a1b1f45b01d28 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 6 May 2017 10:27:13 -0700 Subject: initramfs: avoid "label at end of compound statement" error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Linus Torvalds commit 394e4f5d5834b610ee032cceb20a1b1f45b01d28 upstream. Commit 17a9be317475 ("initramfs: Always do fput() and load modules after rootfs populate") introduced an error for the CONFIG_BLK_DEV_RAM=y case, because even though the code looks fine, the compiler really wants a statement after a label, or you'll get complaints: init/initramfs.c: In function 'populate_rootfs': init/initramfs.c:644:2: error: label at end of compound statement That commit moved the subsequent statements to outside the compound statement, leaving the label without any associated statements. Reported-by: Jörg Otte Fixes: 17a9be317475 ("initramfs: Always do fput() and load modules after rootfs populate") Cc: Al Viro Cc: Stafford Horne Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- init/initramfs.c | 1 + 1 file changed, 1 insertion(+) --- a/init/initramfs.c +++ b/init/initramfs.c @@ -642,6 +642,7 @@ static int __init populate_rootfs(void) free_initrd(); } done: + /* empty statement */; #else printk(KERN_INFO "Unpacking initramfs...\n"); err = unpack_to_rootfs((char *)initrd_start, Patches currently in stable-queue which might be from torvalds@linux-foundation.org are queue-4.11/fs-block_dev-always-invalidate-cleancache-in-invalidate_bdev.patch queue-4.11/ext4-return-to-starting-transaction-in-ext4_dax_huge_fault.patch queue-4.11/dax-prevent-invalidation-of-mapped-dax-entries.patch queue-4.11/dax-fix-pmd-data-corruption-when-fault-races-with-write.patch queue-4.11/fs-xattr.c-zero-out-memory-copied-to-userspace-in-getxattr.patch queue-4.11/x86-boot-fix-bss-corruption-overwrite-bug-in-early-x86-kernel-startup.patch queue-4.11/perf-x86-fix-broadwell-ep-dram-rapl-events.patch queue-4.11/initramfs-avoid-label-at-end-of-compound-statement-error.patch queue-4.11/mm-vmscan-fix-io-refault-regression-in-cache-workingset-transition.patch queue-4.11/selftests-x86-ldt_gdt_32-work-around-a-glibc-sigaction-bug.patch queue-4.11/mm-prevent-potential-recursive-reclaim-due-to-clearing-pf_memalloc.patch queue-4.11/fs-fix-data-invalidation-in-the-cleancache-during-direct-io.patch queue-4.11/mm-fix-data-corruption-due-to-stale-mmap-reads.patch