# git rev-parse -q --verify babf0bb978e3c9fce6c4eba6b744c8754fd43d8e^{commit} babf0bb978e3c9fce6c4eba6b744c8754fd43d8e already have revision, skipping fetch # git checkout -q -f -B kisskb babf0bb978e3c9fce6c4eba6b744c8754fd43d8e # git clean -qxdf # < git log -1 # commit babf0bb978e3c9fce6c4eba6b744c8754fd43d8e # Merge: e375780b631a efd409a4329f # Author: Linus Torvalds # Date: Wed May 25 19:34:40 2022 -0700 # # Merge tag 'xfs-5.19-for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux # # Pull xfs updates from Dave Chinner: # "This is a big update with lots of new code. The summary below them # all, so I'll just touch on teh higlights. The two main new features # are Large Extent Counts and Logged Attribute Replay - these are two # new foundational features that we are building more complex future # features on top of. # # For upcoming functionality, we need to be able to store hundreds of # millions of xattrs per inode. The Large Extent Count feature removes # the limits that prevent this scale of xattr storage, and while we were # modifying the on disk extent count format we also increased the number # of data extents we support per inode from 2^32 to 2^47. # # We also need to be able to modify xattrs as part of larger atomic # transactions rather than as standalone transactions. The Logged # Attribute Replay feature introduces the infrastructure that allows us # to use intents to record the attribute modifications in the journal # before we start them, hence allowing other atomic transactions to log # attribute modification intents and then defer the actual modification # to later. If we then crash, log recovery then guarantees that the # attribute is replayed in the context of the atomic transaction that # logged the intent. # # A significant chunk of the commits in this merge are for the base # attribute replay functionality along with fixes, improvements and # cleanups related to this new functioanlity. Allison deserves a big # round of thanks for her ongoing work to get this functionality into # XFS. # # There are also many other smaller changes and improvements, so overall # this is one of the bigger XFS merge requests in some time. # # I will be following up next week with another smaller pull request - # we already have another round of fixes and improvements to the logged # attribute replay functionality just about ready to go. They'll soak # and test over the next week, and I'll send a pull request for them # near the end of the merge window. # # Summary: # # - support for printk message indexing. # # - large extent counts to provide support for up to 2^47 data extents # and 2^32 attribute extents, allowing us to scale beyond 4 billion # data extents to billions of xattrs per inode. # # - conversion of various flags fields to be consistently declared as # unsigned bit fields. # # - improvements to realtime extent accounting and converts them to # per-cpu counters to match all the other block and inode accounting. # # - reworks core log formatting code to reduce iterations, have a # shorter, cleaner fast path and generally be easier to understand # and maintain. # # - improvements to rmap btree searches that reduce overhead by up to # 30% resulting in xfs_scrub runtime reductions of 15%. # # - improvements to reflink that remove the size limitations in # remapping operations and greatly reduce the size of transaction # reservations. # # - reworks the minimum log size calculations to allow us to change # transaction reservations without changing the minimum supported log # size. # # - removal of quota warning support as it has never been used on # Linux. # # - intent whiteouts to allow us to cancel intents that are completed # entirely in memory rather than having use CPU and disk bandwidth # formatting and writing them into the journal when it is not # necessary. This makes rmap, reflink and extent freeing slightly # more efficient, but provides massive improvements for.... # # - Logged Attribute Replay feature support. This is a fundamental # change to the way we modify attributes, laying the foundation for # future integration of attribute modifications as part of other # atomic transactional operations the filesystem performs. # # - Lots of cleanups and fixes for the logged attribute replay # functionality" # # * tag 'xfs-5.19-for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (124 commits) # xfs: can't use kmem_zalloc() for attribute buffers # xfs: detect empty attr leaf blocks in xfs_attr3_leaf_verify # xfs: ATTR_REPLACE algorithm with LARP enabled needs rework # xfs: use XFS_DA_OP flags in deferred attr ops # xfs: remove xfs_attri_remove_iter # xfs: switch attr remove to xfs_attri_set_iter # xfs: introduce attr remove initial states into xfs_attr_set_iter # xfs: xfs_attr_set_iter() does not need to return EAGAIN # xfs: clean up final attr removal in xfs_attr_set_iter # xfs: remote xattr removal in xfs_attr_set_iter() is conditional # xfs: XFS_DAS_LEAF_REPLACE state only needed if !LARP # xfs: split remote attr setting out from replace path # xfs: consolidate leaf/node states in xfs_attr_set_iter # xfs: kill XFS_DAC_LEAF_ADDNAME_INIT # xfs: separate out initial attr_set states # xfs: don't set quota warning values # xfs: remove warning counters from struct xfs_dquot_res # xfs: remove quota warning limit from struct xfs_quota_limits # xfs: rework deferred attribute operation setup # xfs: make xattri_leaf_bp more useful # ... # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 babf0bb978e3c9fce6c4eba6b744c8754fd43d8e # < make -s -j 24 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 24 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 24 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 24 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1517:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:85: Warning: overflow in branch to __restore_all; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:357: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:360: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/machvec.c: In function 'sh_mv_setup': /kisskb/src/arch/sh/kernel/machvec.c:105:33: error: array subscript 'struct sh_machine_vector[0]' is partly outside array bounds of 'long int[1]' [-Werror=array-bounds] 105 | sh_mv = *(struct sh_machine_vector *)&__machvec_start; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/sh/kernel/machvec.c:13: /kisskb/src/arch/sh/include/asm/sections.h:7:13: note: while referencing '__machvec_start' 7 | extern long __machvec_start, __machvec_end; | ^~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:292: arch/sh/kernel/machvec.o] Error 1 make[3]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/sh/include/asm/hw_irq.h:6, from /kisskb/src/include/linux/irq.h:594, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/sh/include/asm/hardirq.h:9, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/serial_core.h:13, from /kisskb/src/include/linux/serial_sci.h:6, from /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:11: /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:105:31: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:106:9: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:9: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:34: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:292: arch/sh/kernel/cpu/sh2/setup-sh7619.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:555: arch/sh/kernel/cpu/sh2] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:555: arch/sh/kernel/cpu] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:555: arch/sh/kernel] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1835: arch/sh] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 24 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh-allmodconfig_sh4-gcc11 # Build took: 0:03:03.382160