X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fidmap.c;h=eb31028f0c941ea58b751d2a9ab7b5490f21b64a;hb=63de33954c9c8683098d0a69f2c2193e09fb988b;hp=89a00b9a4b779bd14cea7d5b0d6ff2f9f715b8c9;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/idmap.c b/lustre/obdclass/idmap.c index 89a00b9..eb31028 100644 --- a/lustre/obdclass/idmap.c +++ b/lustre/obdclass/idmap.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -40,29 +40,27 @@ * Author: Fan Yong */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif - #define DEBUG_SUBSYSTEM S_SEC #include +#include #include #define lustre_get_group_info(group_info) do { \ - atomic_inc(&(group_info)->usage); \ + cfs_atomic_inc(&(group_info)->usage); \ } while (0) #define lustre_put_group_info(group_info) do { \ - if (atomic_dec_and_test(&(group_info)->usage)) \ - groups_free(group_info); \ + if (cfs_atomic_dec_and_test(&(group_info)->usage)) \ + cfs_groups_free(group_info); \ } while (0) /* * groups_search() is copied from linux kernel! * A simple bsearch. */ -static int lustre_groups_search(struct group_info *group_info, gid_t grp) +static int lustre_groups_search(cfs_group_info_t *group_info, + gid_t grp) { int left, right; @@ -85,7 +83,7 @@ static int lustre_groups_search(struct group_info *group_info, gid_t grp) return 0; } -void lustre_groups_from_list(struct group_info *ginfo, gid_t *glist) +void lustre_groups_from_list(cfs_group_info_t *ginfo, gid_t *glist) { int i; int count = ginfo->ngroups; @@ -104,7 +102,7 @@ EXPORT_SYMBOL(lustre_groups_from_list); /* groups_sort() is copied from linux kernel! */ /* a simple shell-metzner sort */ -void lustre_groups_sort(struct group_info *group_info) +void lustre_groups_sort(cfs_group_info_t *group_info) { int base, max, stride; int gidsetsize = group_info->ngroups; @@ -134,40 +132,40 @@ void lustre_groups_sort(struct group_info *group_info) } EXPORT_SYMBOL(lustre_groups_sort); -int lustre_in_group_p(struct md_ucred *mu, gid_t grp) +int lustre_in_group_p(struct lu_ucred *mu, gid_t grp) { - int rc = 1; - - if (grp != mu->mu_fsgid) { - struct group_info *group_info = NULL; - - if (mu->mu_ginfo || !mu->mu_identity || - mu->mu_valid == UCRED_OLD) - if (grp == mu->mu_suppgids[0] || - grp == mu->mu_suppgids[1]) - return 1; - - if (mu->mu_ginfo) - group_info = mu->mu_ginfo; - else if (mu->mu_identity) - group_info = mu->mu_identity->mi_ginfo; - - if (!group_info) - return 0; - - lustre_get_group_info(group_info); - rc = lustre_groups_search(group_info, grp); - lustre_put_group_info(group_info); - } - return rc; + int rc = 1; + + if (grp != mu->uc_fsgid) { + cfs_group_info_t *group_info = NULL; + + if (mu->uc_ginfo || !mu->uc_identity || + mu->uc_valid == UCRED_OLD) + if (grp == mu->uc_suppgids[0] || + grp == mu->uc_suppgids[1]) + return 1; + + if (mu->uc_ginfo) + group_info = mu->uc_ginfo; + else if (mu->uc_identity) + group_info = mu->uc_identity->mi_ginfo; + + if (!group_info) + return 0; + + lustre_get_group_info(group_info); + rc = lustre_groups_search(group_info, grp); + lustre_put_group_info(group_info); + } + return rc; } EXPORT_SYMBOL(lustre_in_group_p); struct lustre_idmap_entry { - struct list_head lie_rmt_uid_hash; /* hashed as lie_rmt_uid; */ - struct list_head lie_lcl_uid_hash; /* hashed as lie_lcl_uid; */ - struct list_head lie_rmt_gid_hash; /* hashed as lie_rmt_gid; */ - struct list_head lie_lcl_gid_hash; /* hashed as lie_lcl_gid; */ + cfs_list_t lie_rmt_uid_hash; /* hashed as lie_rmt_uid; */ + cfs_list_t lie_lcl_uid_hash; /* hashed as lie_lcl_uid; */ + cfs_list_t lie_rmt_gid_hash; /* hashed as lie_rmt_gid; */ + cfs_list_t lie_lcl_gid_hash; /* hashed as lie_lcl_gid; */ uid_t lie_rmt_uid; /* remote uid */ uid_t lie_lcl_uid; /* local uid */ gid_t lie_rmt_gid; /* remote gid */ @@ -203,14 +201,14 @@ struct lustre_idmap_entry *idmap_entry_alloc(uid_t rmt_uid, uid_t lcl_uid, static void idmap_entry_free(struct lustre_idmap_entry *e) { - if (!list_empty(&e->lie_rmt_uid_hash)) - list_del(&e->lie_rmt_uid_hash); - if (!list_empty(&e->lie_lcl_uid_hash)) - list_del(&e->lie_lcl_uid_hash); - if (!list_empty(&e->lie_rmt_gid_hash)) - list_del(&e->lie_rmt_gid_hash); - if (!list_empty(&e->lie_lcl_gid_hash)) - list_del(&e->lie_lcl_gid_hash); + if (!cfs_list_empty(&e->lie_rmt_uid_hash)) + cfs_list_del(&e->lie_rmt_uid_hash); + if (!cfs_list_empty(&e->lie_lcl_uid_hash)) + cfs_list_del(&e->lie_lcl_uid_hash); + if (!cfs_list_empty(&e->lie_rmt_gid_hash)) + cfs_list_del(&e->lie_rmt_gid_hash); + if (!cfs_list_empty(&e->lie_lcl_gid_hash)) + cfs_list_del(&e->lie_lcl_gid_hash); OBD_FREE_PTR(e); } @@ -225,11 +223,11 @@ struct lustre_idmap_entry *idmap_search_entry(struct lustre_idmap_table *t, uid_t rmt_uid, uid_t lcl_uid, gid_t rmt_gid, gid_t lcl_gid) { - struct list_head *head; + cfs_list_t *head; struct lustre_idmap_entry *e; head = &t->lit_idmaps[RMT_UIDMAP_IDX][lustre_idmap_hashfunc(rmt_uid)]; - list_for_each_entry(e, head, lie_rmt_uid_hash) + cfs_list_for_each_entry(e, head, lie_rmt_uid_hash) if (e->lie_rmt_uid == rmt_uid) { if (e->lie_lcl_uid == lcl_uid) { if (e->lie_rmt_gid == rmt_gid && @@ -246,7 +244,7 @@ struct lustre_idmap_entry *idmap_search_entry(struct lustre_idmap_table *t, } head = &t->lit_idmaps[RMT_GIDMAP_IDX][lustre_idmap_hashfunc(rmt_gid)]; - list_for_each_entry(e, head, lie_rmt_gid_hash) + cfs_list_for_each_entry(e, head, lie_rmt_gid_hash) if (e->lie_rmt_gid == rmt_gid) { if (e->lie_lcl_gid == lcl_gid) { if (unlikely(e->lie_rmt_uid == rmt_uid && @@ -266,17 +264,18 @@ struct lustre_idmap_entry *idmap_search_entry(struct lustre_idmap_table *t, return NULL; } -static __u32 idmap_lookup_uid(struct list_head *hash, int reverse, __u32 uid) +static __u32 idmap_lookup_uid(cfs_list_t *hash, int reverse, + __u32 uid) { - struct list_head *head = &hash[lustre_idmap_hashfunc(uid)]; + cfs_list_t *head = &hash[lustre_idmap_hashfunc(uid)]; struct lustre_idmap_entry *e; if (!reverse) { - list_for_each_entry(e, head, lie_rmt_uid_hash) + cfs_list_for_each_entry(e, head, lie_rmt_uid_hash) if (e->lie_rmt_uid == uid) return e->lie_lcl_uid; } else { - list_for_each_entry(e, head, lie_lcl_uid_hash) + cfs_list_for_each_entry(e, head, lie_lcl_uid_hash) if (e->lie_lcl_uid == uid) return e->lie_rmt_uid; } @@ -284,17 +283,17 @@ static __u32 idmap_lookup_uid(struct list_head *hash, int reverse, __u32 uid) return CFS_IDMAP_NOTFOUND; } -static __u32 idmap_lookup_gid(struct list_head *hash, int reverse, __u32 gid) +static __u32 idmap_lookup_gid(cfs_list_t *hash, int reverse, __u32 gid) { - struct list_head *head = &hash[lustre_idmap_hashfunc(gid)]; + cfs_list_t *head = &hash[lustre_idmap_hashfunc(gid)]; struct lustre_idmap_entry *e; if (!reverse) { - list_for_each_entry(e, head, lie_rmt_gid_hash) + cfs_list_for_each_entry(e, head, lie_rmt_gid_hash) if (e->lie_rmt_gid == gid) return e->lie_lcl_gid; } else { - list_for_each_entry(e, head, lie_lcl_gid_hash) + cfs_list_for_each_entry(e, head, lie_lcl_gid_hash) if (e->lie_lcl_gid == gid) return e->lie_rmt_gid; } @@ -303,38 +302,38 @@ static __u32 idmap_lookup_gid(struct list_head *hash, int reverse, __u32 gid) } int lustre_idmap_add(struct lustre_idmap_table *t, - uid_t ruid, uid_t luid, - gid_t rgid, gid_t lgid) + uid_t ruid, uid_t luid, + gid_t rgid, gid_t lgid) { - struct lustre_idmap_entry *e0, *e1; + struct lustre_idmap_entry *e0, *e1; - LASSERT(t); + LASSERT(t); - spin_lock(&t->lit_lock); - e0 = idmap_search_entry(t, ruid, luid, rgid, lgid); - spin_unlock(&t->lit_lock); - if (!e0) { - e0 = idmap_entry_alloc(ruid, luid, rgid, lgid); - if (!e0) - return -ENOMEM; + spin_lock(&t->lit_lock); + e0 = idmap_search_entry(t, ruid, luid, rgid, lgid); + spin_unlock(&t->lit_lock); + if (!e0) { + e0 = idmap_entry_alloc(ruid, luid, rgid, lgid); + if (!e0) + return -ENOMEM; - spin_lock(&t->lit_lock); + spin_lock(&t->lit_lock); e1 = idmap_search_entry(t, ruid, luid, rgid, lgid); if (e1 == NULL) { - list_add_tail(&e0->lie_rmt_uid_hash, - &t->lit_idmaps[RMT_UIDMAP_IDX] - [lustre_idmap_hashfunc(ruid)]); - list_add_tail(&e0->lie_lcl_uid_hash, - &t->lit_idmaps[LCL_UIDMAP_IDX] - [lustre_idmap_hashfunc(luid)]); - list_add_tail(&e0->lie_rmt_gid_hash, - &t->lit_idmaps[RMT_GIDMAP_IDX] - [lustre_idmap_hashfunc(rgid)]); - list_add_tail(&e0->lie_lcl_gid_hash, - &t->lit_idmaps[LCL_GIDMAP_IDX] - [lustre_idmap_hashfunc(lgid)]); - } - spin_unlock(&t->lit_lock); + cfs_list_add_tail(&e0->lie_rmt_uid_hash, + &t->lit_idmaps[RMT_UIDMAP_IDX] + [lustre_idmap_hashfunc(ruid)]); + cfs_list_add_tail(&e0->lie_lcl_uid_hash, + &t->lit_idmaps[LCL_UIDMAP_IDX] + [lustre_idmap_hashfunc(luid)]); + cfs_list_add_tail(&e0->lie_rmt_gid_hash, + &t->lit_idmaps[RMT_GIDMAP_IDX] + [lustre_idmap_hashfunc(rgid)]); + cfs_list_add_tail(&e0->lie_lcl_gid_hash, + &t->lit_idmaps[LCL_GIDMAP_IDX] + [lustre_idmap_hashfunc(lgid)]); + } + spin_unlock(&t->lit_lock); if (e1 != NULL) { idmap_entry_free(e0); if (IS_ERR(e1)) @@ -352,85 +351,85 @@ int lustre_idmap_del(struct lustre_idmap_table *t, uid_t ruid, uid_t luid, gid_t rgid, gid_t lgid) { - struct lustre_idmap_entry *e; - int rc = 0; + struct lustre_idmap_entry *e; + int rc = 0; - LASSERT(t); + LASSERT(t); - spin_lock(&t->lit_lock); - e = idmap_search_entry(t, ruid, luid, rgid, lgid); - if (IS_ERR(e)) - rc = PTR_ERR(e); - else if (e) - idmap_entry_free(e); - spin_unlock(&t->lit_lock); + spin_lock(&t->lit_lock); + e = idmap_search_entry(t, ruid, luid, rgid, lgid); + if (IS_ERR(e)) + rc = PTR_ERR(e); + else if (e) + idmap_entry_free(e); + spin_unlock(&t->lit_lock); - return rc; + return rc; } EXPORT_SYMBOL(lustre_idmap_del); -int lustre_idmap_lookup_uid(struct md_ucred *mu, - struct lustre_idmap_table *t, - int reverse, uid_t uid) +int lustre_idmap_lookup_uid(struct lu_ucred *mu, + struct lustre_idmap_table *t, + int reverse, uid_t uid) { - struct list_head *hash; - - if (mu && (mu->mu_valid == UCRED_OLD || mu->mu_valid == UCRED_NEW)) { - if (!reverse) { - if (uid == mu->mu_o_uid) - return mu->mu_uid; - else if (uid == mu->mu_o_fsuid) - return mu->mu_fsuid; - } else { - if (uid == mu->mu_uid) - return mu->mu_o_uid; - else if (uid == mu->mu_fsuid) - return mu->mu_o_fsuid; - } - } + cfs_list_t *hash; + + if (mu && (mu->uc_valid == UCRED_OLD || mu->uc_valid == UCRED_NEW)) { + if (!reverse) { + if (uid == mu->uc_o_uid) + return mu->uc_uid; + else if (uid == mu->uc_o_fsuid) + return mu->uc_fsuid; + } else { + if (uid == mu->uc_uid) + return mu->uc_o_uid; + else if (uid == mu->uc_fsuid) + return mu->uc_o_fsuid; + } + } if (t == NULL) return CFS_IDMAP_NOTFOUND; hash = t->lit_idmaps[reverse ? LCL_UIDMAP_IDX : RMT_UIDMAP_IDX]; - spin_lock(&t->lit_lock); - uid = idmap_lookup_uid(hash, reverse, uid); - spin_unlock(&t->lit_lock); + spin_lock(&t->lit_lock); + uid = idmap_lookup_uid(hash, reverse, uid); + spin_unlock(&t->lit_lock); - return uid; + return uid; } EXPORT_SYMBOL(lustre_idmap_lookup_uid); -int lustre_idmap_lookup_gid(struct md_ucred *mu, struct lustre_idmap_table *t, - int reverse, gid_t gid) +int lustre_idmap_lookup_gid(struct lu_ucred *mu, struct lustre_idmap_table *t, + int reverse, gid_t gid) { - struct list_head *hash; - - if (mu && (mu->mu_valid == UCRED_OLD || mu->mu_valid == UCRED_NEW)) { - if (!reverse) { - if (gid == mu->mu_o_gid) - return mu->mu_gid; - else if (gid == mu->mu_o_fsgid) - return mu->mu_fsgid; - } else { - if (gid == mu->mu_gid) - return mu->mu_o_gid; - else if (gid == mu->mu_fsgid) - return mu->mu_o_fsgid; - } - } + cfs_list_t *hash; + + if (mu && (mu->uc_valid == UCRED_OLD || mu->uc_valid == UCRED_NEW)) { + if (!reverse) { + if (gid == mu->uc_o_gid) + return mu->uc_gid; + else if (gid == mu->uc_o_fsgid) + return mu->uc_fsgid; + } else { + if (gid == mu->uc_gid) + return mu->uc_o_gid; + else if (gid == mu->uc_fsgid) + return mu->uc_o_fsgid; + } + } if (t == NULL) return CFS_IDMAP_NOTFOUND; hash = t->lit_idmaps[reverse ? LCL_GIDMAP_IDX : RMT_GIDMAP_IDX]; - spin_lock(&t->lit_lock); - gid = idmap_lookup_gid(hash, reverse, gid); - spin_unlock(&t->lit_lock); + spin_lock(&t->lit_lock); + gid = idmap_lookup_gid(hash, reverse, gid); + spin_unlock(&t->lit_lock); - return gid; + return gid; } EXPORT_SYMBOL(lustre_idmap_lookup_gid); @@ -443,32 +442,33 @@ struct lustre_idmap_table *lustre_idmap_init(void) if(unlikely(t == NULL)) return (ERR_PTR(-ENOMEM)); - spin_lock_init(&t->lit_lock); - for (i = 0; i < ARRAY_SIZE(t->lit_idmaps); i++) - for (j = 0; j < ARRAY_SIZE(t->lit_idmaps[i]); j++) - INIT_LIST_HEAD(&t->lit_idmaps[i][j]); + spin_lock_init(&t->lit_lock); + for (i = 0; i < ARRAY_SIZE(t->lit_idmaps); i++) + for (j = 0; j < ARRAY_SIZE(t->lit_idmaps[i]); j++) + CFS_INIT_LIST_HEAD(&t->lit_idmaps[i][j]); - return t; + return t; } EXPORT_SYMBOL(lustre_idmap_init); void lustre_idmap_fini(struct lustre_idmap_table *t) { - struct list_head *list; + cfs_list_t *list; struct lustre_idmap_entry *e; int i; LASSERT(t); list = t->lit_idmaps[RMT_UIDMAP_IDX]; - spin_lock(&t->lit_lock); - for (i = 0; i < CFS_IDMAP_HASHSIZE; i++) - while (!list_empty(&list[i])) { - e = list_entry(list[i].next, struct lustre_idmap_entry, - lie_rmt_uid_hash); - idmap_entry_free(e); - } - spin_unlock(&t->lit_lock); - - OBD_FREE_PTR(t); + spin_lock(&t->lit_lock); + for (i = 0; i < CFS_IDMAP_HASHSIZE; i++) + while (!cfs_list_empty(&list[i])) { + e = cfs_list_entry(list[i].next, + struct lustre_idmap_entry, + lie_rmt_uid_hash); + idmap_entry_free(e); + } + spin_unlock(&t->lit_lock); + + OBD_FREE_PTR(t); } EXPORT_SYMBOL(lustre_idmap_fini);