Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdc7322f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android11-5.4.147+ (e785a25f) into msm-5.4"

parents 5e3cf80f 2603172e

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.147_dc8c919ca616
 
LTS_5.4.147_e785a25f5262

fs/f2fs/data.c

+7 −1
Original line number Diff line number Diff line
@@ -3354,7 +3354,13 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 
	block_t blkaddr = NULL_ADDR;

	int err = 0;



	if (trace_android_fs_datawrite_start_enabled()) {

	/*

	 * Should avoid quota operations which can make deadlock:

	 * kswapd -> f2fs_evict_inode -> dquot_drop ->

	 *   f2fs_dquot_commit -> f2fs_write_begin ->

	 *   d_obtain_alias -> __d_alloc -> kmem_cache_alloc(GFP_KERNEL)

	 */

	if (trace_android_fs_datawrite_start_enabled() && !IS_NOQUOTA(inode)) {

		char *path, pathbuf[MAX_TRACE_PATHBUF_LEN];



		path = android_fstrace_get_pathname(pathbuf,

fs/incfs/vfs.c

+3 −1
Original line number Diff line number Diff line
@@ -777,8 +777,10 @@ static struct dentry *open_or_create_index_dir(struct dentry *backing_dir) 
	err = vfs_mkdir(backing_inode, index_dentry, 0777);

	inode_unlock(backing_inode);



	if (err)

	if (err) {

		dput(index_dentry);

		return ERR_PTR(err);

	}



	if (!d_really_is_positive(index_dentry)) {

		dput(index_dentry);

include/linux/android_kabi.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
		_new;						\

		struct {					\

			_orig;					\

		} __UNIQUE_ID(android_kabi_hide);		\

		};						\

		__ANDROID_KABI_CHECK_SIZE_ALIGN(_orig, _new);	\

	}

security/selinux/hooks.c

+1 −0
Original line number Diff line number Diff line
@@ -758,6 +758,7 @@ static int selinux_set_mnt_opts(struct super_block *sb, 
	if (!strcmp(sb->s_type->name, "debugfs") ||

	    !strcmp(sb->s_type->name, "tracefs") ||

	    !strcmp(sb->s_type->name, "binder") ||

	    !strcmp(sb->s_type->name, "bpf") ||

	    !strcmp(sb->s_type->name, "pstore"))

		sbsec->flags |= SE_SBGENFS;