# git rev-parse -q --verify f01c30de86f1047e9bae1b1b1417b0ce8dcd15b1^{commit} f01c30de86f1047e9bae1b1b1417b0ce8dcd15b1 already have revision, skipping fetch # git checkout -q -f -B kisskb f01c30de86f1047e9bae1b1b1417b0ce8dcd15b1 # git clean -qxdf # < git log -1 # commit f01c30de86f1047e9bae1b1b1417b0ce8dcd15b1 # Merge: d9315f5634c9 9b8523423b23 # Author: Linus Torvalds # Date: Fri Nov 13 16:07:53 2020 -0800 # # Merge tag 'vfs-5.10-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux # # Pull fs freeze fix and cleanups from Darrick Wong: # "A single vfs fix for 5.10, along with two subsequent cleanups. # # A very long time ago, a hack was added to the vfs fs freeze protection # code to work around lockdep complaints about XFS, which would try to # run a transaction (which requires intwrite protection) to finalize an # xfs freeze (by which time the vfs had already taken intwrite). # # Fast forward a few years, and XFS fixed the recursive intwrite problem # on its own, and the hack became unnecessary. Fast forward almost a # decade, and latent bugs in the code converting this hack from freeze # flags to freeze locks combine with lockdep bugs to make this reproduce # frequently enough to notice page faults racing with freeze. # # Since the hack is unnecessary and causes thread race errors, just get # rid of it completely. Making this kind of vfs change midway through a # cycle makes me nervous, but a large enough number of the usual # VFS/ext4/XFS/btrfs suspects have said this looks good and solves a # real problem vector. # # And once that removal is done, __sb_start_write is now simple enough # that it becomes possible to refactor the function into smaller, # simpler static inline helpers in linux/fs.h. The cleanup is # straightforward. # # Summary: # # - Finally remove the "convert to trylock" weirdness in the fs freezer # code. It was necessary 10 years ago to deal with nested # transactions in XFS, but we've long since removed that; and now # this is causing subtle race conditions when lockdep goes offline # and sb_start_* aren't prepared to retry a trylock failure. # # - Minor cleanups of the sb_start_* fs freeze helpers" # # * tag 'vfs-5.10-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: # vfs: move __sb_{start,end}_write* to fs.h # vfs: separate __sb_start_write into blocking and non-blocking helpers # vfs: remove lockdep bogosity in __sb_start_write # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version # < git log --format=%s --max-count=1 f01c30de86f1047e9bae1b1b1417b0ce8dcd15b1 # < make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- defconfig # make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- FIT description: Linux 5.10.0-rc3-gf01c30de86f1 Created: Sat Nov 14 13:54:03 2020 Image 0 (kernel@0) Description: Linux 5.10.0-rc3-gf01c30de86f1 Created: Sat Nov 14 13:54:03 2020 Type: Kernel Image Compression: gzip compressed Data Size: 5176599 Bytes = 5055.27 KiB = 4.94 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x80985010 Hash algo: sha1 Hash value: 7aad4bc9137886d94955940ac39300b117b849ef Image 1 (fdt@boston) Description: img,boston Device Tree Created: Sat Nov 14 13:54:03 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Sat Nov 14 13:54:03 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Sat Nov 14 13:54:03 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 4659 Bytes = 4.55 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 5bcb6e4f21e8e5372544aa130b3bd097355a9050 Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Sat Nov 14 13:54:03 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 5418 Bytes = 5.29 KiB = 0.01 MiB Architecture: MIPS Hash algo: sha1 Hash value: 93d882f2009a217e0fa9dab94788535ed2be8476 Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Sat Nov 14 13:54:03 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-defconfig_mipsel # Build took: 0:01:10.435638