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

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

Merge "ANDROID: mnt: Fix freeing of mount data"

parents a1bbf6c0 2d7f8058

fs/namespace.c

+0 −3
Original line number Diff line number Diff line
@@ -1033,7 +1033,6 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void 
	if (!mnt)

		return ERR_PTR(-ENOMEM);



	mnt->mnt.data = NULL;

	if (type->alloc_mnt_data) {

		mnt->mnt.data = type->alloc_mnt_data();

		if (!mnt->mnt.data) {
@@ -1047,7 +1046,6 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void 


	root = mount_fs(type, flags, name, &mnt->mnt, data);

	if (IS_ERR(root)) {

		kfree(mnt->mnt.data);

		mnt_free_id(mnt);

		free_vfsmnt(mnt);

		return ERR_CAST(root);
@@ -1169,7 +1167,6 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root, 
	return mnt;



 out_free:

	kfree(mnt->mnt.data);

	mnt_free_id(mnt);

	free_vfsmnt(mnt);

	return ERR_PTR(err);