X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fmdt%2Fmdt_identity.c;h=7b0a31250300e7b87c340c6faf3a3a36b0e78759;hb=355fc1274b484a65e96be1e0289f5aa453c6474d;hp=fb1f889888ea4aaa1b3a2e88ae2cf081696ed707;hpb=b1f7d594a57d3c9c461f177771bb9dddd0e06892;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_identity.c b/lustre/mdt/mdt_identity.c index fb1f889..7b0a312 100644 --- a/lustre/mdt/mdt_identity.c +++ b/lustre/mdt/mdt_identity.c @@ -1,24 +1,42 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2004-2006 Cluster File Systems, Inc. - * Author: Lai Siyao - * Author: Fan Yong + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lustre/mdt/mdt_identity.c + * + * Author: Lai Siyao + * Author: Fan Yong */ #ifndef EXPORT_SYMTAB @@ -44,11 +62,8 @@ #include #include #include -#ifdef HAVE_SEGMENT_H -#include -#endif -#include +#include #include #include #include @@ -72,7 +87,7 @@ static void mdt_identity_entry_free(struct upcall_cache *cache, struct md_identity *identity = &entry->u.identity; if (identity->mi_ginfo) { - groups_free(identity->mi_ginfo); + cfs_put_group_info(identity->mi_ginfo); identity->mi_ginfo = NULL; } @@ -110,9 +125,9 @@ static int mdt_identity_do_upcall(struct upcall_cache *cache, if (unlikely(!upcall)) RETURN(-ENOMEM); - read_lock(&cache->uc_upcall_rwlock); + cfs_read_lock(&cache->uc_upcall_rwlock); memcpy(upcall, cache->uc_upcall, size - 1); - read_unlock(&cache->uc_upcall_rwlock); + cfs_read_unlock(&cache->uc_upcall_rwlock); upcall[size - 1] = 0; if (unlikely(!strcmp(upcall, "NONE"))) { CERROR("no upcall set\n"); @@ -123,7 +138,7 @@ static int mdt_identity_do_upcall(struct upcall_cache *cache, snprintf(keystr, sizeof(keystr), LPU64, entry->ue_key); - CDEBUG(D_INFO, "The upcall is: %s \n", cache->uc_upcall); + CDEBUG(D_INFO, "The upcall is: '%s'\n", cache->uc_upcall); rc = USERMODEHELPER(argv[0], argv, envp); if (rc < 0) { @@ -148,7 +163,7 @@ static int mdt_identity_parse_downcall(struct upcall_cache *cache, { struct md_identity *identity = &entry->u.identity; struct identity_downcall_data *data = args; - struct group_info *ginfo; + cfs_group_info_t *ginfo; struct md_perm *perms = NULL; int size, i; ENTRY; @@ -157,7 +172,7 @@ static int mdt_identity_parse_downcall(struct upcall_cache *cache, if (data->idd_ngroups > NGROUPS_MAX) RETURN(-E2BIG); - ginfo = groups_alloc(data->idd_ngroups); + ginfo = cfs_groups_alloc(data->idd_ngroups); if (!ginfo) { CERROR("failed to alloc %d groups\n", data->idd_ngroups); RETURN(-ENOMEM); @@ -172,7 +187,7 @@ static int mdt_identity_parse_downcall(struct upcall_cache *cache, if (!perms) { CERROR("failed to alloc %d permissions\n", data->idd_nperms); - groups_free(ginfo); + cfs_put_group_info(ginfo); RETURN(-ENOMEM); } @@ -270,10 +285,8 @@ __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 ptlrpc_request *req = mdt_info_req(info); struct md_ucred *uc = mdt_ucred(info); struct md_object *next = mdt_object_child(o); - struct mdt_export_data *med = mdt_req2med(req); struct mdt_remote_perm *perm = buf; ENTRY; @@ -281,7 +294,7 @@ int mdt_pack_remote_perm(struct mdt_thread_info *info, struct mdt_object *o, /* remote client request always pack ptlrpc_user_desc! */ LASSERT(perm); - if (!med->med_rmtclient) + if (!exp_connect_rmtclient(info->mti_exp)) RETURN(-EBADE); if ((uc->mu_valid != UCRED_OLD) && (uc->mu_valid != UCRED_NEW))