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

Commit e4fd72a1 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: cleanup idmapper functions to take an nfs_server argument 



...instead of the nfs_client.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f0b85168

fs/nfs/idmap.c

+12 −12
Original line number Diff line number Diff line
@@ -241,21 +241,21 @@ static int nfs_idmap_lookup_id(const char *name, size_t namelen, 
	return ret;

}



int nfs_map_name_to_uid(struct nfs_client *clp, const char *name, size_t namelen, __u32 *uid)

int nfs_map_name_to_uid(const struct nfs_server *server, const char *name, size_t namelen, __u32 *uid)

{

	if (nfs_map_string_to_numeric(name, namelen, uid))

		return 0;

	return nfs_idmap_lookup_id(name, namelen, "uid", uid);

}



int nfs_map_group_to_gid(struct nfs_client *clp, const char *name, size_t namelen, __u32 *gid)

int nfs_map_group_to_gid(const struct nfs_server *server, const char *name, size_t namelen, __u32 *gid)

{

	if (nfs_map_string_to_numeric(name, namelen, gid))

		return 0;

	return nfs_idmap_lookup_id(name, namelen, "gid", gid);

}



int nfs_map_uid_to_name(struct nfs_client *clp, __u32 uid, char *buf, size_t buflen)

int nfs_map_uid_to_name(const struct nfs_server *server, __u32 uid, char *buf, size_t buflen)

{

	int ret;

	ret = nfs_idmap_lookup_name(uid, "user", buf, buflen);
@@ -263,7 +263,7 @@ int nfs_map_uid_to_name(struct nfs_client *clp, __u32 uid, char *buf, size_t buf 
		ret = nfs_map_numeric_to_string(uid, buf, buflen);

	return ret;

}

int nfs_map_gid_to_group(struct nfs_client *clp, __u32 gid, char *buf, size_t buflen)

int nfs_map_gid_to_group(const struct nfs_server *server, __u32 gid, char *buf, size_t buflen)

{

	int ret;
@@ -729,27 +729,27 @@ static unsigned int fnvhash32(const void *buf, size_t buflen) 
	return hash;

}



int nfs_map_name_to_uid(struct nfs_client *clp, const char *name, size_t namelen, __u32 *uid)

int nfs_map_name_to_uid(const struct nfs_server *server, const char *name, size_t namelen, __u32 *uid)

{

	struct idmap *idmap = clp->cl_idmap;

	struct idmap *idmap = server->nfs_client->cl_idmap;



	if (nfs_map_string_to_numeric(name, namelen, uid))

		return 0;

	return nfs_idmap_id(idmap, &idmap->idmap_user_hash, name, namelen, uid);

}



int nfs_map_group_to_gid(struct nfs_client *clp, const char *name, size_t namelen, __u32 *uid)

int nfs_map_group_to_gid(const struct nfs_server *server, const char *name, size_t namelen, __u32 *uid)

{

	struct idmap *idmap = clp->cl_idmap;

	struct idmap *idmap = server->nfs_client->cl_idmap;



	if (nfs_map_string_to_numeric(name, namelen, uid))

		return 0;

	return nfs_idmap_id(idmap, &idmap->idmap_group_hash, name, namelen, uid);

}



int nfs_map_uid_to_name(struct nfs_client *clp, __u32 uid, char *buf, size_t buflen)

int nfs_map_uid_to_name(const struct nfs_server *server, __u32 uid, char *buf, size_t buflen)

{

	struct idmap *idmap = clp->cl_idmap;

	struct idmap *idmap = server->nfs_client->cl_idmap;

	int ret;



	ret = nfs_idmap_name(idmap, &idmap->idmap_user_hash, uid, buf);
@@ -757,9 +757,9 @@ int nfs_map_uid_to_name(struct nfs_client *clp, __u32 uid, char *buf, size_t buf 
		ret = nfs_map_numeric_to_string(uid, buf, buflen);

	return ret;

}

int nfs_map_gid_to_group(struct nfs_client *clp, __u32 uid, char *buf, size_t buflen)

int nfs_map_gid_to_group(const struct nfs_server *server, __u32 uid, char *buf, size_t buflen)

{

	struct idmap *idmap = clp->cl_idmap;

	struct idmap *idmap = server->nfs_client->cl_idmap;

	int ret;



	ret = nfs_idmap_name(idmap, &idmap->idmap_group_hash, uid, buf);

fs/nfs/nfs4xdr.c

+8 −10
Original line number Diff line number Diff line
@@ -844,7 +844,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const 
	if (iap->ia_valid & ATTR_MODE)

		len += 4;

	if (iap->ia_valid & ATTR_UID) {

		owner_namelen = nfs_map_uid_to_name(server->nfs_client, iap->ia_uid, owner_name, IDMAP_NAMESZ);

		owner_namelen = nfs_map_uid_to_name(server, iap->ia_uid, owner_name, IDMAP_NAMESZ);

		if (owner_namelen < 0) {

			dprintk("nfs: couldn't resolve uid %d to string\n",

					iap->ia_uid);
@@ -856,7 +856,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const 
		len += 4 + (XDR_QUADLEN(owner_namelen) << 2);

	}

	if (iap->ia_valid & ATTR_GID) {

		owner_grouplen = nfs_map_gid_to_group(server->nfs_client, iap->ia_gid, owner_group, IDMAP_NAMESZ);

		owner_grouplen = nfs_map_gid_to_group(server, iap->ia_gid, owner_group, IDMAP_NAMESZ);

		if (owner_grouplen < 0) {

			dprintk("nfs: couldn't resolve gid %d to string\n",

					iap->ia_gid);
@@ -3387,7 +3387,7 @@ static int decode_attr_nlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t 
}



static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap,

		struct nfs_client *clp, uint32_t *uid, int may_sleep)

		const struct nfs_server *server, uint32_t *uid, int may_sleep)

{

	uint32_t len;

	__be32 *p;
@@ -3407,7 +3407,7 @@ static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, 
		if (!may_sleep) {

			/* do nothing */

		} else if (len < XDR_MAX_NETOBJ) {

			if (nfs_map_name_to_uid(clp, (char *)p, len, uid) == 0)

			if (nfs_map_name_to_uid(server, (char *)p, len, uid) == 0)

				ret = NFS_ATTR_FATTR_OWNER;

			else

				dprintk("%s: nfs_map_name_to_uid failed!\n",
@@ -3425,7 +3425,7 @@ static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, 
}



static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap,

		struct nfs_client *clp, uint32_t *gid, int may_sleep)

		const struct nfs_server *server, uint32_t *gid, int may_sleep)

{

	uint32_t len;

	__be32 *p;
@@ -3445,7 +3445,7 @@ static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap, 
		if (!may_sleep) {

			/* do nothing */

		} else if (len < XDR_MAX_NETOBJ) {

			if (nfs_map_group_to_gid(clp, (char *)p, len, gid) == 0)

			if (nfs_map_group_to_gid(server, (char *)p, len, gid) == 0)

				ret = NFS_ATTR_FATTR_GROUP;

			else

				dprintk("%s: nfs_map_group_to_gid failed!\n",
@@ -3944,14 +3944,12 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap, 
		goto xdr_error;

	fattr->valid |= status;



	status = decode_attr_owner(xdr, bitmap, server->nfs_client,

			&fattr->uid, may_sleep);

	status = decode_attr_owner(xdr, bitmap, server, &fattr->uid, may_sleep);

	if (status < 0)

		goto xdr_error;

	fattr->valid |= status;



	status = decode_attr_group(xdr, bitmap, server->nfs_client,

			&fattr->gid, may_sleep);

	status = decode_attr_group(xdr, bitmap, server, &fattr->gid, may_sleep);

	if (status < 0)

		goto xdr_error;

	fattr->valid |= status;

include/linux/nfs_idmap.h

+5 −4
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ struct idmap_msg { 


/* Forward declaration to make this header independent of others */

struct nfs_client;

struct nfs_server;



#ifdef CONFIG_NFS_USE_NEW_IDMAPPER
@@ -96,10 +97,10 @@ void nfs_idmap_delete(struct nfs_client *); 


#endif /* CONFIG_NFS_USE_NEW_IDMAPPER */



int nfs_map_name_to_uid(struct nfs_client *, const char *, size_t, __u32 *);

int nfs_map_group_to_gid(struct nfs_client *, const char *, size_t, __u32 *);

int nfs_map_uid_to_name(struct nfs_client *, __u32, char *, size_t);

int nfs_map_gid_to_group(struct nfs_client *, __u32, char *, size_t);

int nfs_map_name_to_uid(const struct nfs_server *, const char *, size_t, __u32 *);

int nfs_map_group_to_gid(const struct nfs_server *, const char *, size_t, __u32 *);

int nfs_map_uid_to_name(const struct nfs_server *, __u32, char *, size_t);

int nfs_map_gid_to_group(const struct nfs_server *, __u32, char *, size_t);



extern unsigned int nfs_idmap_cache_timeout;

#endif /* __KERNEL__ */