X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_identity.c;h=9e44e90929634bd1dfd3ff15c8e752a728dfcb7f;hb=55ba9897d156399ab4ccb1626866f87565a24cbe;hp=e16f1cdd9b3c4063b593978e7d4d7b5c56544708;hpb=65701b4a30efdb695776bcf690a2b3cabc928da1;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_identity.c b/lustre/mdt/mdt_identity.c index e16f1cd..9e44e90 100644 --- a/lustre/mdt/mdt_identity.c +++ b/lustre/mdt/mdt_identity.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. @@ -29,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -41,14 +39,8 @@ * Author: Fan Yong */ -#ifndef EXPORT_SYMTAB -#define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_MDS -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include @@ -58,7 +50,6 @@ #include #include #include -#include #include #include #include @@ -84,21 +75,21 @@ static void mdt_identity_entry_init(struct upcall_cache_entry *entry, } static void mdt_identity_entry_free(struct upcall_cache *cache, - struct upcall_cache_entry *entry) + struct upcall_cache_entry *entry) { - struct md_identity *identity = &entry->u.identity; - - if (identity->mi_ginfo) { - cfs_put_group_info(identity->mi_ginfo); - identity->mi_ginfo = NULL; - } - - if (identity->mi_nperms) { - LASSERT(identity->mi_perms); - OBD_FREE(identity->mi_perms, - identity->mi_nperms * sizeof(struct md_perm)); - identity->mi_nperms = 0; - } + struct md_identity *identity = &entry->u.identity; + + if (identity->mi_ginfo) { + put_group_info(identity->mi_ginfo); + identity->mi_ginfo = NULL; + } + + if (identity->mi_nperms) { + LASSERT(identity->mi_perms); + OBD_FREE(identity->mi_perms, + identity->mi_nperms * sizeof(struct md_perm)); + identity->mi_nperms = 0; + } } static int mdt_identity_do_upcall(struct upcall_cache *cache, @@ -123,7 +114,7 @@ static int mdt_identity_do_upcall(struct upcall_cache *cache, /* There is race condition: * "uc_upcall" was changed just after "is_identity_get_disabled" check. */ - cfs_read_lock(&cache->uc_upcall_rwlock); + read_lock(&cache->uc_upcall_rwlock); CDEBUG(D_INFO, "The upcall is: '%s'\n", cache->uc_upcall); if (unlikely(!strcmp(cache->uc_upcall, "NONE"))) { @@ -134,10 +125,10 @@ static int mdt_identity_do_upcall(struct upcall_cache *cache, argv[0] = cache->uc_upcall; snprintf(keystr, sizeof(keystr), LPU64, entry->ue_key); - cfs_gettimeofday(&start); - rc = USERMODEHELPER(argv[0], argv, envp); - cfs_gettimeofday(&end); - if (rc < 0) { + do_gettimeofday(&start); + rc = call_usermodehelper(argv[0], argv, envp, 1); + do_gettimeofday(&end); + if (rc < 0) { CERROR("%s: error invoking upcall %s %s %s: rc %d; " "check /proc/fs/lustre/mdt/%s/identity_upcall, " "time %ldus\n", @@ -151,64 +142,64 @@ static int mdt_identity_do_upcall(struct upcall_cache *cache, } EXIT; out: - cfs_read_unlock(&cache->uc_upcall_rwlock); + read_unlock(&cache->uc_upcall_rwlock); return rc; } static int mdt_identity_parse_downcall(struct upcall_cache *cache, - struct upcall_cache_entry *entry, - void *args) + struct upcall_cache_entry *entry, + void *args) { - struct md_identity *identity = &entry->u.identity; - struct identity_downcall_data *data = args; - cfs_group_info_t *ginfo = NULL; - struct md_perm *perms = NULL; - int size, i; - ENTRY; - - LASSERT(data); - if (data->idd_ngroups > NGROUPS_MAX) - RETURN(-E2BIG); - - if (data->idd_ngroups > 0) { - ginfo = cfs_groups_alloc(data->idd_ngroups); - if (!ginfo) { - CERROR("failed to alloc %d groups\n", data->idd_ngroups); - RETURN(-ENOMEM); - } - - lustre_groups_from_list(ginfo, data->idd_groups); - lustre_groups_sort(ginfo); - } - - if (data->idd_nperms) { - size = data->idd_nperms * sizeof(*perms); - OBD_ALLOC(perms, size); - if (!perms) { - CERROR("failed to alloc %d permissions\n", - data->idd_nperms); - if (ginfo != NULL) - cfs_put_group_info(ginfo); - RETURN(-ENOMEM); - } - - for (i = 0; i < data->idd_nperms; i++) { - perms[i].mp_nid = data->idd_perms[i].pdd_nid; - perms[i].mp_perm = data->idd_perms[i].pdd_perm; - } - } - - identity->mi_uid = data->idd_uid; - identity->mi_gid = data->idd_gid; - identity->mi_ginfo = ginfo; - identity->mi_nperms = data->idd_nperms; - identity->mi_perms = perms; - - CDEBUG(D_OTHER, "parse mdt identity@%p: %d:%d, ngroups %u, nperms %u\n", - identity, identity->mi_uid, identity->mi_gid, - data->idd_ngroups, data->idd_nperms); - - RETURN(0); + struct md_identity *identity = &entry->u.identity; + struct identity_downcall_data *data = args; + struct group_info *ginfo = NULL; + struct md_perm *perms = NULL; + int size, i; + ENTRY; + + LASSERT(data); + if (data->idd_ngroups > NGROUPS_MAX) + RETURN(-E2BIG); + + if (data->idd_ngroups > 0) { + ginfo = groups_alloc(data->idd_ngroups); + if (!ginfo) { + CERROR("failed to alloc %d groups\n", data->idd_ngroups); + RETURN(-ENOMEM); + } + + lustre_groups_from_list(ginfo, data->idd_groups); + lustre_groups_sort(ginfo); + } + + if (data->idd_nperms) { + size = data->idd_nperms * sizeof(*perms); + OBD_ALLOC(perms, size); + if (!perms) { + CERROR("failed to alloc %d permissions\n", + data->idd_nperms); + if (ginfo != NULL) + put_group_info(ginfo); + RETURN(-ENOMEM); + } + + for (i = 0; i < data->idd_nperms; i++) { + perms[i].mp_nid = data->idd_perms[i].pdd_nid; + perms[i].mp_perm = data->idd_perms[i].pdd_perm; + } + } + + identity->mi_uid = data->idd_uid; + identity->mi_gid = data->idd_gid; + identity->mi_ginfo = ginfo; + identity->mi_nperms = data->idd_nperms; + identity->mi_perms = perms; + + CDEBUG(D_OTHER, "parse mdt identity@%p: %d:%d, ngroups %u, nperms %u\n", + identity, identity->mi_uid, identity->mi_gid, + data->idd_ngroups, data->idd_nperms); + + RETURN(0); } struct md_identity *mdt_identity_get(struct upcall_cache *cache, __u32 uid) @@ -286,7 +277,7 @@ __u32 mdt_identity_get_perm(struct md_identity *identity, int mdt_pack_remote_perm(struct mdt_thread_info *info, struct mdt_object *o, void *buf) { - struct md_ucred *uc = mdt_ucred(info); + struct lu_ucred *uc = mdt_ucred_check(info); struct md_object *next = mdt_object_child(o); struct mdt_remote_perm *perm = buf; @@ -298,13 +289,13 @@ int mdt_pack_remote_perm(struct mdt_thread_info *info, struct mdt_object *o, if (!exp_connect_rmtclient(info->mti_exp)) RETURN(-EBADE); - if ((uc->mu_valid != UCRED_OLD) && (uc->mu_valid != UCRED_NEW)) - RETURN(-EINVAL); + if (uc == NULL) + RETURN(-EINVAL); - perm->rp_uid = uc->mu_o_uid; - perm->rp_gid = uc->mu_o_gid; - perm->rp_fsuid = uc->mu_o_fsuid; - perm->rp_fsgid = uc->mu_o_fsgid; + perm->rp_uid = uc->uc_o_uid; + perm->rp_gid = uc->uc_o_gid; + perm->rp_fsuid = uc->uc_o_fsuid; + perm->rp_fsgid = uc->uc_o_fsgid; perm->rp_access_perm = 0; if (mo_permission(info->mti_env, NULL, next, NULL, MAY_READ) == 0)