# git rev-parse -q --verify 37187df45af7d28d27b5c130c23f407ca9dbefa2^{commit} 37187df45af7d28d27b5c130c23f407ca9dbefa2 already have revision, skipping fetch # git checkout -q -f -B kisskb 37187df45af7d28d27b5c130c23f407ca9dbefa2 # git clean -qxdf # < git log -1 # commit 37187df45af7d28d27b5c130c23f407ca9dbefa2 # Merge: 531d29b0b674 1a31182edd00 # Author: Linus Torvalds # Date: Wed Oct 14 12:23:00 2020 -0700 # # Merge tag 'iomap-5.10-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux # # Pull iomap updates from Darrick Wong: # "There's not a lot of new stuff going on here -- a little bit of code # refactoring to make iomap workable with btrfs' fsync locking model, # cleanups in preparation for adding THP support for filesystems, and # fixing a data corruption issue for blocksize < pagesize filesystems. # # Summary: # # - Don't WARN_ON weird states that unprivileged users can create. # # - Don't invalidate page cache when direct writes want to fall back to # buffered. # # - Fix some problems when readahead ios fail. # # - Fix a problem where inline data pages weren't getting flushed # during an unshare operation. # # - Rework iomap to support arbitrarily many blocks per page in # preparation to support THP for the page cache. # # - Fix a bug in the blocksize < pagesize buffered io path where we # could fail to initialize the many-blocks-per-page uptodate bitmap # correctly when the backing page is actually up to date. This could # cause us to forget to write out dirty pages. # # - Split out the generic_write_sync at the end of the directio write # path so that btrfs can drop the inode lock before sync'ing the # file. # # - Call inode_dio_end before trying to sync the file after a O_DSYNC # direct write (instead of afterwards) to match the behavior of the # old directio code" # # * tag 'iomap-5.10-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: # iomap: Call inode_dio_end() before generic_write_sync() # iomap: Allow filesystem to call iomap_dio_complete without i_rwsem # iomap: Set all uptodate bits for an Uptodate page # iomap: Change calling convention for zeroing # iomap: Convert iomap_write_end types # iomap: Convert write_count to write_bytes_pending # iomap: Convert read_count to read_bytes_pending # iomap: Support arbitrarily many blocks per page # iomap: Use bitmap ops to set uptodate bits # iomap: Use kzalloc to allocate iomap_page # fs: Introduce i_blocks_per_page # iomap: Fix misplaced page flushing # iomap: Use round_down/round_up macros in __iomap_write_begin # iomap: Mark read blocks uptodate in write_begin # iomap: Clear page error before beginning a write # iomap: Fix direct I/O write consistency check # iomap: fix WARN_ON_ONCE() from unprivileged users # < /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 37187df45af7d28d27b5c130c23f407ca9dbefa2 # < make -s -j 120 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 120 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/include/linux/printk.h:7, from /kisskb/src/include/linux/kernel.h:15, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/rculist.h:10, from /kisskb/src/include/linux/pid.h:5, from /kisskb/src/include/linux/sched.h:14, from /kisskb/src/fs/btrfs/extent-tree.c:6: /kisskb/src/fs/btrfs/extent-tree.c: In function '__btrfs_free_extent': /kisskb/src/include/linux/kern_levels.h:5:18: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'unsigned int' [-Wformat=] #define KERN_SOH "\001" /* ASCII Start Of Header */ ^~~~~~ /kisskb/src/include/linux/kern_levels.h:10:19: note: in expansion of macro 'KERN_SOH' #define KERN_CRIT KERN_SOH "2" /* critical conditions */ ^~~~~~~~ /kisskb/src/fs/btrfs/ctree.h:3148:24: note: in expansion of macro 'KERN_CRIT' btrfs_printk(fs_info, KERN_CRIT fmt, ##args) ^~~~~~~~~ /kisskb/src/fs/btrfs/extent-tree.c:3187:4: note: in expansion of macro 'btrfs_crit' btrfs_crit(info, ^~~~~~~~~~ /kisskb/src/fs/btrfs/extent-tree.c:3188:83: note: format string is defined here "invalid extent item size for key (%llu, %u, %llu) owner %llu, has %u expect >= %lu", ~~^ %u 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:01.216726