Unverified Commit eb7718cd authored by Christian Brauner's avatar Christian Brauner Committed by Christian Brauner (Microsoft)
Browse files

fs: remove unused idmapping helpers 



Now that all places can deal with the new type safe helpers remove all
of the old helpers.

Reviewed-by: default avatarSeth Forshee (DigitalOcean) <sforshee@kernel.org>
Signed-off-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
parent c12db92d

include/linux/fs.h

+0 −34
Original line number Original line Diff line number Diff line
@@ -1612,23 +1612,6 @@ static inline void i_gid_write(struct inode *inode, gid_t gid) 
	inode->i_gid = make_kgid(i_user_ns(inode), gid);

	inode->i_gid = make_kgid(i_user_ns(inode), gid);

}

}





/**

 * i_uid_into_mnt - map an inode's i_uid down into a mnt_userns

 * @mnt_userns: user namespace of the mount the inode was found from

 * @inode: inode to map

 *

 * Note, this will eventually be removed completely in favor of the type-safe

 * i_uid_into_vfsuid().

 *

 * Return: the inode's i_uid mapped down according to @mnt_userns.

 * If the inode's i_uid has no mapping INVALID_UID is returned.

 */

static inline kuid_t i_uid_into_mnt(struct user_namespace *mnt_userns,

				    const struct inode *inode)

{

	return AS_KUIDT(make_vfsuid(mnt_userns, i_user_ns(inode), inode->i_uid));

}



/**

/**

 * i_uid_into_vfsuid - map an inode's i_uid down into a mnt_userns

 * i_uid_into_vfsuid - map an inode's i_uid down into a mnt_userns

 * @mnt_userns: user namespace of the mount the inode was found from

 * @mnt_userns: user namespace of the mount the inode was found from
@@ -1681,23 +1664,6 @@ static inline void i_uid_update(struct user_namespace *mnt_userns, 
					   attr->ia_vfsuid);

					   attr->ia_vfsuid);

}

}





/**

 * i_gid_into_mnt - map an inode's i_gid down into a mnt_userns

 * @mnt_userns: user namespace of the mount the inode was found from

 * @inode: inode to map

 *

 * Note, this will eventually be removed completely in favor of the type-safe

 * i_gid_into_vfsgid().

 *

 * Return: the inode's i_gid mapped down according to @mnt_userns.

 * If the inode's i_gid has no mapping INVALID_GID is returned.

 */

static inline kgid_t i_gid_into_mnt(struct user_namespace *mnt_userns,

				    const struct inode *inode)

{

	return AS_KGIDT(make_vfsgid(mnt_userns, i_user_ns(inode), inode->i_gid));

}



/**

/**

 * i_gid_into_vfsgid - map an inode's i_gid down into a mnt_userns

 * i_gid_into_vfsgid - map an inode's i_gid down into a mnt_userns

 * @mnt_userns: user namespace of the mount the inode was found from

 * @mnt_userns: user namespace of the mount the inode was found from

include/linux/mnt_idmapping.h

+0 −68
Original line number Original line Diff line number Diff line
@@ -228,13 +228,6 @@ static inline vfsuid_t make_vfsuid(struct user_namespace *mnt_userns, 
	return VFSUIDT_INIT(make_kuid(mnt_userns, uid));

	return VFSUIDT_INIT(make_kuid(mnt_userns, uid));

}

}





static inline kuid_t mapped_kuid_fs(struct user_namespace *mnt_userns,

				    struct user_namespace *fs_userns,

				    kuid_t kuid)

{

	return AS_KUIDT(make_vfsuid(mnt_userns, fs_userns, kuid));

}



/**

/**

 * make_vfsgid - map a filesystem kgid into a mnt_userns

 * make_vfsgid - map a filesystem kgid into a mnt_userns

 * @mnt_userns: the mount's idmapping

 * @mnt_userns: the mount's idmapping
@@ -273,13 +266,6 @@ static inline vfsgid_t make_vfsgid(struct user_namespace *mnt_userns, 
	return VFSGIDT_INIT(make_kgid(mnt_userns, gid));

	return VFSGIDT_INIT(make_kgid(mnt_userns, gid));

}

}





static inline kgid_t mapped_kgid_fs(struct user_namespace *mnt_userns,

				    struct user_namespace *fs_userns,

				    kgid_t kgid)

{

	return AS_KGIDT(make_vfsgid(mnt_userns, fs_userns, kgid));

}



/**

/**

 * from_vfsuid - map a vfsuid into the filesystem idmapping

 * from_vfsuid - map a vfsuid into the filesystem idmapping

 * @mnt_userns: the mount's idmapping

 * @mnt_userns: the mount's idmapping
@@ -307,33 +293,6 @@ static inline kuid_t from_vfsuid(struct user_namespace *mnt_userns, 
	return make_kuid(fs_userns, uid);

	return make_kuid(fs_userns, uid);

}

}





/**

 * mapped_kuid_user - map a user kuid into a mnt_userns

 * @mnt_userns: the mount's idmapping

 * @fs_userns: the filesystem's idmapping

 * @kuid : kuid to be mapped

 *

 * Use the idmapping of @mnt_userns to remap a @kuid into @fs_userns. Use this

 * function when preparing a @kuid to be written to disk or inode.

 *

 * If no_idmapping() determines that this is not an idmapped mount we can

 * simply return @kuid unchanged.

 * If initial_idmapping() tells us that the filesystem is not mounted with an

 * idmapping we know the value of @kuid won't change when calling

 * make_kuid() so we can simply retrieve the value via KUIDT_INIT()

 * directly.

 *

 * Return: @kuid mapped according to @mnt_userns.

 * If @kuid has no mapping in either @mnt_userns or @fs_userns INVALID_UID is

 * returned.

 */

static inline kuid_t mapped_kuid_user(struct user_namespace *mnt_userns,

				      struct user_namespace *fs_userns,

				      kuid_t kuid)

{

	return from_vfsuid(mnt_userns, fs_userns, VFSUIDT_INIT(kuid));

}



/**

/**

 * vfsuid_has_fsmapping - check whether a vfsuid maps into the filesystem

 * vfsuid_has_fsmapping - check whether a vfsuid maps into the filesystem

 * @mnt_userns: the mount's idmapping

 * @mnt_userns: the mount's idmapping
@@ -399,33 +358,6 @@ static inline kgid_t from_vfsgid(struct user_namespace *mnt_userns, 
	return make_kgid(fs_userns, gid);

	return make_kgid(fs_userns, gid);

}

}





/**

 * mapped_kgid_user - map a user kgid into a mnt_userns

 * @mnt_userns: the mount's idmapping

 * @fs_userns: the filesystem's idmapping

 * @kgid : kgid to be mapped

 *

 * Use the idmapping of @mnt_userns to remap a @kgid into @fs_userns. Use this

 * function when preparing a @kgid to be written to disk or inode.

 *

 * If no_idmapping() determines that this is not an idmapped mount we can

 * simply return @kgid unchanged.

 * If initial_idmapping() tells us that the filesystem is not mounted with an

 * idmapping we know the value of @kgid won't change when calling

 * make_kgid() so we can simply retrieve the value via KGIDT_INIT()

 * directly.

 *

 * Return: @kgid mapped according to @mnt_userns.

 * If @kgid has no mapping in either @mnt_userns or @fs_userns INVALID_GID is

 * returned.

 */

static inline kgid_t mapped_kgid_user(struct user_namespace *mnt_userns,

				      struct user_namespace *fs_userns,

				      kgid_t kgid)

{

	return from_vfsgid(mnt_userns, fs_userns, VFSGIDT_INIT(kgid));

}



/**

/**

 * vfsgid_has_fsmapping - check whether a vfsgid maps into the filesystem

 * vfsgid_has_fsmapping - check whether a vfsgid maps into the filesystem

 * @mnt_userns: the mount's idmapping

 * @mnt_userns: the mount's idmapping