Merge tag 'mm-hotfixes-stable-2023-03-04-13-12' of... (20fdfd55) · Commits · EulixOS / Software / Kernel

.mailmap

+3 −0

arch/x86/include/asm/string_64.h

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -85,25 +85,6 @@ char strcpy(char dest, const char *src);
	char strcat(char dest, const char *src);		char strcat(char dest, const char *src);
	int strcmp(const char cs, const char ct);		int strcmp(const char cs, const char ct);

	#if (defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__))
	/*
	* For files that not instrumented (e.g. mm/slub.c) we
	* should use not instrumented version of mem* functions.
	*/

	#undef memcpy
	#define memcpy(dst, src, len) __memcpy(dst, src, len)
	#undef memmove
	#define memmove(dst, src, len) __memmove(dst, src, len)
	#undef memset
	#define memset(s, c, n) __memset(s, c, n)

	#ifndef __NO_FORTIFY
	#define __NO_FORTIFY /* FORTIFY_SOURCE uses __builtin_memcpy, etc. */
	#endif

	#endif

	#ifdef CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE		#ifdef CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE
	#define __HAVE_ARCH_MEMCPY_FLUSHCACHE 1		#define __HAVE_ARCH_MEMCPY_FLUSHCACHE 1
	void __memcpy_flushcache(void dst, const void src, size_t cnt);		void __memcpy_flushcache(void dst, const void src, size_t cnt);

fs/cramfs/inode.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -183,7 +183,7 @@ static void cramfs_blkdev_read(struct super_block sb, unsigned int offset,
	unsigned int len)		unsigned int len)
	{		{
	struct address_space *mapping = sb->s_bdev->bd_inode->i_mapping;		struct address_space *mapping = sb->s_bdev->bd_inode->i_mapping;
	struct file_ra_state ra;		struct file_ra_state ra = {};
	struct page *pages[BLKS_PER_BUF];		struct page *pages[BLKS_PER_BUF];
	unsigned i, blocknr, buffer;		unsigned i, blocknr, buffer;
	unsigned long devsize;		unsigned long devsize;

fs/hfsplus/super.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -295,11 +295,11 @@ static void hfsplus_put_super(struct super_block *sb)
	hfsplus_sync_fs(sb, 1);		hfsplus_sync_fs(sb, 1);
	}		}

			iput(sbi->alloc_file);
			iput(sbi->hidden_dir);
	hfs_btree_close(sbi->attr_tree);		hfs_btree_close(sbi->attr_tree);
	hfs_btree_close(sbi->cat_tree);		hfs_btree_close(sbi->cat_tree);
	hfs_btree_close(sbi->ext_tree);		hfs_btree_close(sbi->ext_tree);
	iput(sbi->alloc_file);
	iput(sbi->hidden_dir);
	kfree(sbi->s_vhdr_buf);		kfree(sbi->s_vhdr_buf);
	kfree(sbi->s_backup_vhdr_buf);		kfree(sbi->s_backup_vhdr_buf);
	unload_nls(sbi->nls);		unload_nls(sbi->nls);

fs/ocfs2/move_extents.c

+13 −21

Original line number	Original line	Diff line number	Diff line
	@@ -105,14 +105,6 @@ static int __ocfs2_move_extent(handle_t *handle,
	*/		*/
	replace_rec.e_flags = ext_flags & ~OCFS2_EXT_REFCOUNTED;		replace_rec.e_flags = ext_flags & ~OCFS2_EXT_REFCOUNTED;

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode),
	context->et.et_root_bh,
	OCFS2_JOURNAL_ACCESS_WRITE);
	if (ret) {
	mlog_errno(ret);
	goto out;
	}

	ret = ocfs2_split_extent(handle, &context->et, path, index,		ret = ocfs2_split_extent(handle, &context->et, path, index,
	&replace_rec, context->meta_ac,		&replace_rec, context->meta_ac,
	&context->dealloc);		&context->dealloc);
	@@ -121,8 +113,6 @@ static int __ocfs2_move_extent(handle_t *handle,
	goto out;		goto out;
	}		}

	ocfs2_journal_dirty(handle, context->et.et_root_bh);

	context->new_phys_cpos = new_p_cpos;		context->new_phys_cpos = new_p_cpos;

	/*		/*
	@@ -444,7 +434,7 @@ static int ocfs2_find_victim_alloc_group(struct inode *inode,
	bg = (struct ocfs2_group_desc *)gd_bh->b_data;		bg = (struct ocfs2_group_desc *)gd_bh->b_data;

	if (vict_blkno < (le64_to_cpu(bg->bg_blkno) +		if (vict_blkno < (le64_to_cpu(bg->bg_blkno) +
	le16_to_cpu(bg->bg_bits))) {		(le16_to_cpu(bg->bg_bits) << bits_per_unit))) {

	*ret_bh = gd_bh;		*ret_bh = gd_bh;
	*vict_bit = (vict_blkno - blkno) >>		*vict_bit = (vict_blkno - blkno) >>
	@@ -559,6 +549,7 @@ static void ocfs2_probe_alloc_group(struct inode inode, struct buffer_head bh,
	last_free_bits++;		last_free_bits++;

	if (last_free_bits == move_len) {		if (last_free_bits == move_len) {
			i -= move_len;
	*goal_bit = i;		*goal_bit = i;
	*phys_cpos = base_cpos + i;		*phys_cpos = base_cpos + i;
	break;		break;
	@@ -1030,8 +1021,6 @@ int ocfs2_ioctl_move_extents(struct file filp, void __user argp)

	context->range = &range;		context->range = &range;

	if (range.me_flags & OCFS2_MOVE_EXT_FL_AUTO_DEFRAG) {
	context->auto_defrag = 1;
	/*		/*
	* ok, the default theshold for the defragmentation		* ok, the default theshold for the defragmentation
	* is 1M, since our maximum clustersize was 1M also.		* is 1M, since our maximum clustersize was 1M also.
	@@ -1043,6 +1032,9 @@ int ocfs2_ioctl_move_extents(struct file filp, void __user argp)
	if (range.me_threshold > i_size_read(inode))		if (range.me_threshold > i_size_read(inode))
	range.me_threshold = i_size_read(inode);		range.me_threshold = i_size_read(inode);

			if (range.me_flags & OCFS2_MOVE_EXT_FL_AUTO_DEFRAG) {
			context->auto_defrag = 1;

	if (range.me_flags & OCFS2_MOVE_EXT_FL_PART_DEFRAG)		if (range.me_flags & OCFS2_MOVE_EXT_FL_PART_DEFRAG)
	context->partial = 1;		context->partial = 1;
	} else {		} else {

Original line number	Original line	Diff line number	Diff line
	@@ -121,6 +121,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
	Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
	Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
	<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>		<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
			Dikshita Agarwal <dikshita@qti.qualcomm.com> <dikshita@codeaurora.org>
	Dmitry Baryshkov <dbaryshkov@gmail.com>		Dmitry Baryshkov <dbaryshkov@gmail.com>
	Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>		Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
	Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>		Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
	@@ -150,6 +151,7 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
	Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>		Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
	Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>		Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
	Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>		Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
			Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>
	Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
	Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
	Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
	@@ -441,6 +443,7 @@ Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org>
	Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>		Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>
	Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>		Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>
	Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>		Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
			Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>
	Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>		Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
	Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>		Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
	Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>		Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>