# 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/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-gcc --version # < /opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-ld --version # < git log --format=%s --max-count=1 5631c5e0eb9035d92ceb20fcd9cdb7779a3f5cc7 # < make -s -j 24 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_64BIT=n # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # < make -s -j 24 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- help # make -s -j 24 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- olddefconfig # make -s -j 24 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/drivers/tty/serial/sunzilog.c:1128:13: warning: 'sunzilog_putchar' defined but not used [-Wunused-function] static void sunzilog_putchar(struct uart_port *port, int ch) ^ /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ /kisskb/src/sound/soc/tegra/tegra210_dmic.c:43:12: warning: 'tegra210_dmic_runtime_suspend' defined but not used [-Wunused-function] static int tegra210_dmic_runtime_suspend(struct device *dev) ^ /kisskb/src/sound/soc/tegra/tegra210_dmic.c:55:12: warning: 'tegra210_dmic_runtime_resume' defined but not used [-Wunused-function] static int tegra210_dmic_runtime_resume(struct device *dev) ^ /kisskb/src/sound/soc/tegra/tegra210_ahub.c:567:12: warning: 'tegra_ahub_runtime_suspend' defined but not used [-Wunused-function] static int tegra_ahub_runtime_suspend(struct device *dev) ^ /kisskb/src/sound/soc/tegra/tegra210_ahub.c:579:12: warning: 'tegra_ahub_runtime_resume' defined but not used [-Wunused-function] static int tegra_ahub_runtime_resume(struct device *dev) ^ /kisskb/src/sound/soc/tegra/tegra210_i2s.c:167:12: warning: 'tegra210_i2s_runtime_suspend' defined but not used [-Wunused-function] static int tegra210_i2s_runtime_suspend(struct device *dev) ^ /kisskb/src/sound/soc/tegra/tegra210_i2s.c:179:12: warning: 'tegra210_i2s_runtime_resume' defined but not used [-Wunused-function] static int tegra210_i2s_runtime_resume(struct device *dev) ^ /kisskb/src/sound/soc/tegra/tegra186_dspk.c:74:12: warning: 'tegra186_dspk_runtime_suspend' defined but not used [-Wunused-function] static int tegra186_dspk_runtime_suspend(struct device *dev) ^ /kisskb/src/sound/soc/tegra/tegra186_dspk.c:86:12: warning: 'tegra186_dspk_runtime_resume' defined but not used [-Wunused-function] static int tegra186_dspk_runtime_resume(struct device *dev) ^ /kisskb/src/sound/soc/tegra/tegra210_admaif.c:222:12: warning: 'tegra_admaif_runtime_suspend' defined but not used [-Wunused-function] static int tegra_admaif_runtime_suspend(struct device *dev) ^ /kisskb/src/sound/soc/tegra/tegra210_admaif.c:232:12: warning: 'tegra_admaif_runtime_resume' defined but not used [-Wunused-function] static int tegra_admaif_runtime_resume(struct device *dev) ^ In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:7:0, from /kisskb/src/arch/sparc/include/asm/atomic_32.h:17, from /kisskb/src/arch/sparc/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/asm-generic/bitops/lock.h:5, from /kisskb/src/arch/sparc/include/asm/bitops_32.h:102, from /kisskb/src/arch/sparc/include/asm/bitops.h:7, from /kisskb/src/include/linux/bitops.h:29, from /kisskb/src/include/linux/kernel.h:12, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/wait.h:7, 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/sparc/include/asm/cmpxchg_32.h:28: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); ^ /kisskb/src/drivers/mailbox/imx-mailbox.c:601:12: warning: 'imx_mu_suspend_noirq' defined but not used [-Wunused-function] static int imx_mu_suspend_noirq(struct device *dev) ^ /kisskb/src/drivers/mailbox/imx-mailbox.c:611:12: warning: 'imx_mu_resume_noirq' defined but not used [-Wunused-function] static int imx_mu_resume_noirq(struct device *dev) ^ /kisskb/src/drivers/mailbox/imx-mailbox.c:629:12: warning: 'imx_mu_runtime_suspend' defined but not used [-Wunused-function] static int imx_mu_runtime_suspend(struct device *dev) ^ /kisskb/src/drivers/mailbox/imx-mailbox.c:638:12: warning: 'imx_mu_runtime_resume' defined but not used [-Wunused-function] static int imx_mu_runtime_resume(struct device *dev) ^ In file included from /kisskb/src/include/linux/printk.h:405:0, from /kisskb/src/include/linux/kernel.h:15, from /kisskb/src/include/linux/clk.h:13, from /kisskb/src/drivers/crypto/sa2ul.c:11: /kisskb/src/drivers/crypto/sa2ul.c: In function 'sa_sha_init': /kisskb/src/drivers/crypto/sa2ul.c:1486:33: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] crypto_ahash_digestsize(tfm), (u64)rctx); ^ /kisskb/src/include/linux/dynamic_debug.h:125:15: note: in definition of macro '__dynamic_func_call' func(&id, ##__VA_ARGS__); \ ^ /kisskb/src/include/linux/dynamic_debug.h:157:2: note: in expansion of macro '_dynamic_func_call' _dynamic_func_call(fmt,__dynamic_dev_dbg, \ ^ /kisskb/src/include/linux/dev_printk.h:115:2: note: in expansion of macro 'dynamic_dev_dbg' dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/drivers/crypto/sa2ul.c:1485:2: note: in expansion of macro 'dev_dbg' dev_dbg(sa_k3_dev, "init: digest size: %d, rctx=%llx\n", ^ In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:7:0, from /kisskb/src/arch/sparc/include/asm/atomic_32.h:17, from /kisskb/src/arch/sparc/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/asm-generic/bitops/lock.h:5, from /kisskb/src/arch/sparc/include/asm/bitops_32.h:102, from /kisskb/src/arch/sparc/include/asm/bitops.h:7, from /kisskb/src/include/linux/bitops.h:29, from /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c:11: /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c: In function 'ixgbevf_xdp_setup': /kisskb/src/arch/sparc/include/asm/cmpxchg_32.h:28:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c:4469:4: note: in expansion of macro 'xchg' xchg(&adapter->rx_ring[i]->xdp_prog, adapter->xdp_prog); ^ In file included from /kisskb/src/drivers/net/ethernet/intel/ice/ice_flex_pipe.c:6:0: /kisskb/src/drivers/net/ethernet/intel/ice/ice_flex_pipe.c: In function 'ice_free_flow_profs': /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.h:197:33: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] #define ICE_FLOW_ENTRY_HNDL(e) ((u64)e) ^ /kisskb/src/drivers/net/ethernet/intel/ice/ice_flex_pipe.c:2921:9: note: in expansion of macro 'ICE_FLOW_ENTRY_HNDL' ICE_FLOW_ENTRY_HNDL(e)); ^ In file included from /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c:5:0: /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c: In function 'ice_flow_add_entry': /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.h:197:33: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] #define ICE_FLOW_ENTRY_HNDL(e) ((u64)e) ^ /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c:946:13: note: in expansion of macro 'ICE_FLOW_ENTRY_HNDL' *entry_h = ICE_FLOW_ENTRY_HNDL(e); ^ /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c: In function 'ice_flow_rem_entry': /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.h:198:32: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define ICE_FLOW_ENTRY_PTR(h) ((struct ice_flow_entry *)(h)) ^ /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c:974:10: note: in expansion of macro 'ICE_FLOW_ENTRY_PTR' entry = ICE_FLOW_ENTRY_PTR(entry_h); ^ In file included from /kisskb/src/include/linux/skbuff.h:31:0, from /kisskb/src/include/linux/if_ether.h:19, from /kisskb/src/include/uapi/linux/ethtool.h:19, from /kisskb/src/include/linux/ethtool.h:18, from /kisskb/src/include/linux/netdevice.h:37, from /kisskb/src/drivers/net/ethernet/sfc/net_driver.h:13, from /kisskb/src/drivers/net/ethernet/sfc/ef100.c:12: /kisskb/src/drivers/net/ethernet/sfc/ef100.c: In function 'ef100_pci_parse_continue_entry': /kisskb/src/include/linux/dma-mapping.h:139:25: warning: large integer implicitly truncated to unsigned type [-Woverflow] #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c:145:6: note: in expansion of macro 'DMA_BIT_MASK' DMA_BIT_MASK(ESF_GZ_TX_SEND_ADDR_WIDTH), ^ /kisskb/src/include/linux/dma-mapping.h:139:25: warning: large integer implicitly truncated to unsigned type [-Woverflow] #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c:163:6: note: in expansion of macro 'DMA_BIT_MASK' DMA_BIT_MASK(ESF_GZ_TX_SEND_ADDR_WIDTH), ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c: In function 'ef100_pci_parse_xilinx_cap': /kisskb/src/include/linux/dma-mapping.h:139:25: warning: large integer implicitly truncated to unsigned type [-Woverflow] #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c:337:5: note: in expansion of macro 'DMA_BIT_MASK' DMA_BIT_MASK(ESF_GZ_TX_SEND_ADDR_WIDTH), ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c: In function 'ef100_pci_probe': /kisskb/src/include/linux/dma-mapping.h:139:25: warning: large integer implicitly truncated to unsigned type [-Woverflow] #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c:498:5: note: in expansion of macro 'DMA_BIT_MASK' DMA_BIT_MASK(ESF_GZ_TX_SEND_ADDR_WIDTH), ^ WARNING: modpost: EXPORT symbol "bzero_1page" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "___rw_read_exit" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "___rw_read_try" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "__ndelay" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "__ashrdi3" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "empty_zero_page" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "__udelay" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "__lshrdi3" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "___rw_write_enter" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "__ashldi3" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "__copy_1page" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "__muldi3" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "__divdi3" [vmlinux] version generation failed, symbol will not be versioned. WARNING: modpost: EXPORT symbol "___rw_read_enter" [vmlinux] version generation failed, symbol will not be versioned. arch/sparc/kernel/head_32.o: In function `current_pc': arch/sparc/kernel/head_32.o:(.head.text+0x5040): relocation truncated to fit: R_SPARC_WDISP22 against `.init.text' arch/sparc/kernel/head_32.o: In function `halt_notsup': arch/sparc/kernel/head_32.o:(.head.text+0x5100): relocation truncated to fit: R_SPARC_WDISP22 against `.init.text' arch/sparc/kernel/head_32.o: In function `leon_init': arch/sparc/kernel/head_32.o:(.init.text+0xa4): relocation truncated to fit: R_SPARC_WDISP22 against symbol `leon_smp_cpu_startup' defined in .text section in arch/sparc/kernel/trampoline_32.o arch/sparc/kernel/process_32.o:(.fixup+0x4): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/process_32.o:(.fixup+0xc): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/signal_32.o:(.fixup+0x4): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/signal_32.o:(.fixup+0x10): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/signal_32.o:(.fixup+0x1c): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/signal_32.o:(.fixup+0x28): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/signal_32.o:(.fixup+0x34): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/signal_32.o:(.fixup+0x40): additional relocation overflows omitted from the output make[1]: *** [/kisskb/src/Makefile:1159: vmlinux] Error 1 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 24 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sparc-allmodconfig_sparc64 # Build took: 0:15:01.602467