/* -*- 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 <lsy@clusterfs.com>
- * Author: Fan Yong <fanyong@clusterfs.com>
+ * 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 <lsy@clusterfs.com>
+ * Author: Fan Yong <fanyong@clusterfs.com>
*/
#ifndef EXPORT_SYMTAB
#include <asm/uaccess.h>
#include <linux/slab.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
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;
}
[1] = "PATH=/sbin:/usr/sbin",
[2] = NULL
};
+ struct timeval start, end;
int size, rc;
ENTRY;
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");
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);
+ cfs_gettimeofday(&start);
rc = USERMODEHELPER(argv[0], argv, envp);
+ cfs_gettimeofday(&end);
if (rc < 0) {
CERROR("%s: error invoking upcall %s %s %s: rc %d; "
- "check /proc/fs/lustre/mdt/%s/identity_upcall\n",
+ "check /proc/fs/lustre/mdt/%s/identity_upcall, "
+ "time %ldus\n",
cache->uc_name, argv[0], argv[1], argv[2], rc,
- cache->uc_name);
+ cache->uc_name, cfs_timeval_sub(&end, &start, NULL));
} else {
- CDEBUG(D_HA, "%s: invoked upcall %s %s %s\n", cache->uc_name,
- argv[0], argv[1], argv[2]);
+ CDEBUG(D_HA, "%s: invoked upcall %s %s %s, time %ldus\n",
+ cache->uc_name, argv[0], argv[1], argv[2],
+ cfs_timeval_sub(&end, &start, NULL));
rc = 0;
}
EXIT;
{
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;
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);
if (!perms) {
CERROR("failed to alloc %d permissions\n",
data->idd_nperms);
- groups_free(ginfo);
+ cfs_put_group_info(ginfo);
RETURN(-ENOMEM);
}
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;
/* 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))
git://git.whamcloud.com / fs / lustre-release.git / blobdiff