Unverified Commit 02e40799 authored by Christian Brauner's avatar Christian Brauner
Browse files

fs: remove unused low-level mapping helpers 

Now that we ported all places to use the new low-level mapping helpers
that are able to support filesystems mounted with an idmapping we can
remove the old low-level mapping helpers. With the removal of these old
helpers we also conclude the renaming of the mapping helpers we started
in commit a65e58e7 ("fs: document and rename fsid helpers").

Link: https://lore.kernel.org/r/20211123114227.3124056-8-brauner@kernel.org (v1)
Link: https://lore.kernel.org/r/20211130121032.3753852-8-brauner@kernel.org (v2)
Link: https://lore.kernel.org/r/20211203111707.3901969-8-brauner@kernel.org


Cc: Seth Forshee <sforshee@digitalocean.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
CC: linux-fsdevel@vger.kernel.org
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarSeth Forshee <sforshee@digitalocean.com>
Signed-off-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 44720713

include/linux/mnt_idmapping.h

+0 −56
Original line number Original line Diff line number Diff line
@@ -13,62 +13,6 @@ struct user_namespace; 
 */

 */

extern struct user_namespace init_user_ns;

extern struct user_namespace init_user_ns;





/**

 * kuid_into_mnt - map a kuid down into a mnt_userns

 * @mnt_userns: user namespace of the relevant mount

 * @kuid: kuid to be mapped

 *

 * Return: @kuid mapped according to @mnt_userns.

 * If @kuid has no mapping INVALID_UID is returned.

 */

static inline kuid_t kuid_into_mnt(struct user_namespace *mnt_userns,

				   kuid_t kuid)

{

	return make_kuid(mnt_userns, __kuid_val(kuid));

}



/**

 * kgid_into_mnt - map a kgid down into a mnt_userns

 * @mnt_userns: user namespace of the relevant mount

 * @kgid: kgid to be mapped

 *

 * Return: @kgid mapped according to @mnt_userns.

 * If @kgid has no mapping INVALID_GID is returned.

 */

static inline kgid_t kgid_into_mnt(struct user_namespace *mnt_userns,

				   kgid_t kgid)

{

	return make_kgid(mnt_userns, __kgid_val(kgid));

}



/**

 * kuid_from_mnt - map a kuid up into a mnt_userns

 * @mnt_userns: user namespace of the relevant mount

 * @kuid: kuid to be mapped

 *

 * Return: @kuid mapped up according to @mnt_userns.

 * If @kuid has no mapping INVALID_UID is returned.

 */

static inline kuid_t kuid_from_mnt(struct user_namespace *mnt_userns,

				   kuid_t kuid)

{

	return KUIDT_INIT(from_kuid(mnt_userns, kuid));

}



/**

 * kgid_from_mnt - map a kgid up into a mnt_userns

 * @mnt_userns: user namespace of the relevant mount

 * @kgid: kgid to be mapped

 *

 * Return: @kgid mapped up according to @mnt_userns.

 * If @kgid has no mapping INVALID_GID is returned.

 */

static inline kgid_t kgid_from_mnt(struct user_namespace *mnt_userns,

				   kgid_t kgid)

{

	return KGIDT_INIT(from_kgid(mnt_userns, kgid));

}



/**

/**

 * initial_idmapping - check whether this is the initial mapping

 * initial_idmapping - check whether this is the initial mapping

 * @ns: idmapping to check

 * @ns: idmapping to check