# git rev-parse -q --verify 5631c5e0eb9035d92ceb20fcd9cdb7779a3f5cc7^{commit} 5631c5e0eb9035d92ceb20fcd9cdb7779a3f5cc7 already have revision, skipping fetch # git checkout -q -f -B kisskb 5631c5e0eb9035d92ceb20fcd9cdb7779a3f5cc7 # git clean -qxdf # < git log -1 # commit 5631c5e0eb9035d92ceb20fcd9cdb7779a3f5cc7 # Merge: e51418191f5a 818d5a91559f # Author: Linus Torvalds # Date: Fri Aug 7 10:57:29 2020 -0700 # # Merge tag 'xfs-5.9-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux # # Pull xfs updates from Darrick Wong: # "There are quite a few changes in this release, the most notable of # which is that we've made inode flushing fully asynchronous, and we no # longer block memory reclaim on this. # # Furthermore, we have fixed a long-standing bug in the quota code where # soft limit warnings and inode limits were never tracked properly. # # Moving further down the line, the reflink control loops have been # redesigned to behave more efficiently; and numerous small bugs have # been fixed (see below). The xattr and quota code have been extensively # refactored in preparation for more new features coming down the line. # # Finally, the behavior of DAX between ext4 and xfs has been stabilized, # which gets us a step closer to removing the experimental tag from that # feature. # # We have a few new contributors this time around. Welcome, all! # # I anticipate a second pull request next week for a few small bugfixes # that have been trickling in, but this is it for big changes. # # Summary: # # - Fix some btree block pingponging problems when swapping extents # # - Redesign the reflink copy loop so that we only run one remapping # operation per transaction. This helps us avoid running out of block # reservation on highly deduped filesystems. # # - Take the MMAPLOCK around filemap_map_pages. # # - Make inode reclaim fully async so that we avoid stalling processes # on flushing inodes to disk. # # - Reduce inode cluster buffer RMW cycles by attaching the buffer to # dirty inodes so we won't let go of the cluster buffer when we know # we're going to need it soon. # # - Add some more checks to the realtime bitmap file scrubber. # # - Don't trip false lockdep warnings in fs freeze. # # - Remove various redundant lines of code. # # - Remove unnecessary calls to xfs_perag_{get,put}. # # - Preserve I_VERSION state across remounts. # # - Fix an unmount hang due to AIL going to sleep with a non-empty # delwri buffer list. # # - Fix an error in the inode allocation space reservation macro that # caused regressions in generic/531. # # - Fix a potential livelock when dquot flush fails because the dquot # buffer is locked. # # - Fix a miscalculation when reserving inode quota that could cause # users to exceed a hardlimit. # # - Refactor struct xfs_dquot to use native types for incore fields # instead of abusing the ondisk struct for this purpose. This will # eventually enable proper y2038+ support, but for now it merely # cleans up the quota function declarations. # # - Actually increment the quota softlimit warning counter so that soft # failures turn into hard(er) failures when they exceed the softlimit # warning counter limits set by the administrator. # # - Split incore dquot state flags into their own field and namespace, # to avoid mixing them with quota type flags. # # - Create a new quota type flags namespace so that we can make it # obvious when a quota function takes a quota type (user, group, # project) as an argument. # # - Rename the ondisk dquot flags field to type, as that more # accurately represents what we store in it. # # - Drop our bespoke memory allocation flags in favor of GFP_*. # # - Rearrange the xattr functions so that we no longer mix metadata # updates and transaction management (e.g. rolling complex # transactions) in the same functions. This work will prepare us for # atomic xattr operations (itself a prerequisite for directory # backrefs) in future release cycles. # # - Support FS_DAX_FL (aka FS_XFLAG_DAX) via GETFLAGS/SETFLAGS" # # * tag 'xfs-5.9-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (117 commits) # fs/xfs: Support that ioctl(SETXFLAGS/GETXFLAGS) can set/get inode DAX on XFS. # xfs: Lift -ENOSPC handler from xfs_attr_leaf_addname # xfs: Simplify xfs_attr_node_addname # xfs: Simplify xfs_attr_leaf_addname # xfs: Add helper function xfs_attr_node_removename_rmt # xfs: Add helper function xfs_attr_node_removename_setup # xfs: Add remote block helper functions # xfs: Add helper function xfs_attr_leaf_mark_incomplete # xfs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform # xfs: Remove xfs_trans_roll in xfs_attr_node_removename # xfs: Remove unneeded xfs_trans_roll_inode calls # xfs: Add helper function xfs_attr_node_shrink # xfs: Pull up xfs_attr_rmtval_invalidate # xfs: Refactor xfs_attr_rmtval_remove # xfs: Pull up trans roll in xfs_attr3_leaf_clearflag # xfs: Factor out xfs_attr_rmtval_invalidate # xfs: Pull up trans roll from xfs_attr3_leaf_setflag # xfs: Refactor xfs_attr_try_sf_addname # xfs: Split apart xfs_attr_leaf_addname # xfs: Pull up trans handling in xfs_attr3_leaf_flipflags # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 5631c5e0eb9035d92ceb20fcd9cdb7779a3f5cc7 # < make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # < make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:12424:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- In file included from /kisskb/src/arch/mips/include/asm/bug.h:42, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/thread_info.h:12, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:15, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/include/linux/seqlock.h: In function 'write_seqcount_begin_nested': /kisskb/src/include/asm-generic/percpu.h:31:40: error: implicit declaration of function 'raw_smp_processor_id'; did you mean 'mips_set_process_fp_mode'? [-Werror=implicit-function-declaration] #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/bug.h:145:27: note: in definition of macro 'WARN_ON_ONCE' int __ret_warn_once = !!(condition); \ ^~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:301:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:313:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:119:10: note: in expansion of macro 'READ_ONCE' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:231:2: note: in expansion of macro 'RELOC_HIDE' RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)) ^~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:44:31: note: in expansion of macro 'SHIFT_PERCPU_PTR' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:31:25: note: in expansion of macro 'per_cpu_offset' #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:44:53: note: in expansion of macro '__my_cpu_offset' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^~~~~~~~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:242:2: note: in expansion of macro 'arch_raw_cpu_ptr' arch_raw_cpu_ptr(ptr); \ ^~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:119:21: note: in expansion of macro 'raw_cpu_ptr' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:138:11: note: in expansion of macro '__this_cpu_generic_read_nopreempt' __ret = __this_cpu_generic_read_nopreempt(pcp); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:320:31: note: in expansion of macro 'this_cpu_generic_read' #define this_cpu_read_1(pcp) this_cpu_generic_read(pcp) ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:321:23: note: in expansion of macro 'this_cpu_read_1' case 1: pscr_ret__ = stem##1(variable); break; \ ^~~~ /kisskb/src/include/linux/percpu-defs.h:507:29: note: in expansion of macro '__pcpu_size_call_return' #define this_cpu_read(pcp) __pcpu_size_call_return(this_cpu_read_, pcp) ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/lockdep.h:565:9: note: in expansion of macro 'this_cpu_read' this_cpu_read(hardirqs_enabled))); \ ^~~~~~~~~~~~~ /kisskb/src/include/linux/seqlock.h:285:2: note: in expansion of macro 'lockdep_assert_preemption_disabled' lockdep_assert_preemption_disabled(); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/include/linux/smp.h:82, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/time32.h:13, from /kisskb/src/include/linux/time.h:74, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/arch/mips/include/asm/smp.h: At top level: /kisskb/src/arch/mips/include/asm/smp.h:28:19: error: static declaration of 'raw_smp_processor_id' follows non-static declaration static inline int raw_smp_processor_id(void) ^~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/mips/include/asm/bug.h:42, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/thread_info.h:12, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:15, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/include/asm-generic/percpu.h:31:40: note: previous implicit declaration of 'raw_smp_processor_id' was here #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/bug.h:145:27: note: in definition of macro 'WARN_ON_ONCE' int __ret_warn_once = !!(condition); \ ^~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:301:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:313:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:119:10: note: in expansion of macro 'READ_ONCE' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:231:2: note: in expansion of macro 'RELOC_HIDE' RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)) ^~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:44:31: note: in expansion of macro 'SHIFT_PERCPU_PTR' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:31:25: note: in expansion of macro 'per_cpu_offset' #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:44:53: note: in expansion of macro '__my_cpu_offset' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^~~~~~~~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:242:2: note: in expansion of macro 'arch_raw_cpu_ptr' arch_raw_cpu_ptr(ptr); \ ^~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:119:21: note: in expansion of macro 'raw_cpu_ptr' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:138:11: note: in expansion of macro '__this_cpu_generic_read_nopreempt' __ret = __this_cpu_generic_read_nopreempt(pcp); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:320:31: note: in expansion of macro 'this_cpu_generic_read' #define this_cpu_read_1(pcp) this_cpu_generic_read(pcp) ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:321:23: note: in expansion of macro 'this_cpu_read_1' case 1: pscr_ret__ = stem##1(variable); break; \ ^~~~ /kisskb/src/include/linux/percpu-defs.h:507:29: note: in expansion of macro '__pcpu_size_call_return' #define this_cpu_read(pcp) __pcpu_size_call_return(this_cpu_read_, pcp) ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/lockdep.h:565:9: note: in expansion of macro 'this_cpu_read' this_cpu_read(hardirqs_enabled))); \ ^~~~~~~~~~~~~ /kisskb/src/include/linux/seqlock.h:285:2: note: in expansion of macro 'lockdep_assert_preemption_disabled' lockdep_assert_preemption_disabled(); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:114: arch/mips/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1195: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:00:13.810004