# 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/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 f01c30de86f1047e9bae1b1b1417b0ce8dcd15b1 # < make -s -j 48 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig WARNING: unmet direct dependencies detected for NEED_MULTIPLE_NODES Depends on [n]: DISCONTIGMEM [=n] || NUMA Selected by [y]: - SINGLE_MEMORY_CHUNK [=y] && MMU [=y] WARNING: unmet direct dependencies detected for NEED_MULTIPLE_NODES Depends on [n]: DISCONTIGMEM [=n] || NUMA Selected by [y]: - SINGLE_MEMORY_CHUNK [=y] && MMU [=y] # < make -s -j 48 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 48 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig WARNING: unmet direct dependencies detected for NEED_MULTIPLE_NODES Depends on [n]: DISCONTIGMEM [=n] || NUMA Selected by [y]: - SINGLE_MEMORY_CHUNK [=y] && MMU [=y] WARNING: unmet direct dependencies detected for NEED_MULTIPLE_NODES Depends on [n]: DISCONTIGMEM [=n] || NUMA Selected by [y]: - SINGLE_MEMORY_CHUNK [=y] && MMU [=y] # make -s -j 48 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/kernel/rcu/update.c:578: /kisskb/src/kernel/rcu/tasks.h:710:13: warning: 'show_rcu_tasks_rude_gp_kthread' defined but not used [-Wunused-function] static void show_rcu_tasks_rude_gp_kthread(void) {} ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/m68k/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/linux/cpumask.h:13, from /kisskb/src/include/linux/smp.h:13, from /kisskb/src/include/linux/lockdep.h:14, from /kisskb/src/include/linux/spinlock.h:59, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ocfs2/file.c:13: /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/arch/m68k/include/asm/cmpxchg.h:79:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/fs/ocfs2/file.c:2419:3: note: in expansion of macro 'xchg' xchg(&iocb->ki_complete, saved_ki_complete); ^~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc8 # Build took: 0:01:56.236042