Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-1302 llog: add env to llog_process functions
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
sec_config.c
diff --git
a/lustre/ptlrpc/sec_config.c
b/lustre/ptlrpc/sec_config.c
index
a8b9630
..
d12d7b3
100644
(file)
--- a/
lustre/ptlrpc/sec_config.c
+++ b/
lustre/ptlrpc/sec_config.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.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-28,15
+26,14
@@
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Lustre is a trademark of Sun Microsystems, Inc.
*/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Lustre is a trademark of Sun Microsystems, Inc.
*/
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_SEC
#include <libcfs/libcfs.h>
#define DEBUG_SUBSYSTEM S_SEC
#include <libcfs/libcfs.h>
@@
-452,8
+449,8
@@
void sptlrpc_rule_set_dump(struct sptlrpc_rule_set *rset)
for (n = 0; n < rset->srs_nrule; n++) {
r = &rset->srs_rules[n];
for (n = 0; n < rset->srs_nrule; n++) {
r = &rset->srs_rules[n];
- C
WARN(
"<%02d> from %x to %x, net %x, rpc %x\n", n,
- r->sr_from, r->sr_to, r->sr_netid, r->sr_flvr.sf_rpc);
+ C
DEBUG(D_SEC,
"<%02d> from %x to %x, net %x, rpc %x\n", n,
+
r->sr_from, r->sr_to, r->sr_netid, r->sr_flvr.sf_rpc);
}
}
EXPORT_SYMBOL(sptlrpc_rule_set_dump);
}
}
EXPORT_SYMBOL(sptlrpc_rule_set_dump);
@@
-795,14
+792,13
@@
EXPORT_SYMBOL(sptlrpc_conf_log_update_end);
void sptlrpc_conf_log_start(const char *logname)
{
void sptlrpc_conf_log_start(const char *logname)
{
- struct sptlrpc_conf *conf;
char fsname[16];
if (logname2fsname(logname, fsname, sizeof(fsname)))
return;
cfs_mutex_lock(&sptlrpc_conf_lock);
char fsname[16];
if (logname2fsname(logname, fsname, sizeof(fsname)))
return;
cfs_mutex_lock(&sptlrpc_conf_lock);
-
conf =
sptlrpc_conf_get(fsname, 1);
+ sptlrpc_conf_get(fsname, 1);
cfs_mutex_unlock(&sptlrpc_conf_lock);
}
EXPORT_SYMBOL(sptlrpc_conf_log_start);
cfs_mutex_unlock(&sptlrpc_conf_lock);
}
EXPORT_SYMBOL(sptlrpc_conf_log_start);
@@
-1031,8
+1027,8
@@
int sptlrpc_target_local_copy_conf(struct obd_device *obd,
push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
- dentry = lookup_one_len(MOUNT_CONFIGS_DIR, cfs_fs_pwd(current->fs),
- strlen(MOUNT_CONFIGS_DIR));
+ dentry = l
l_l
ookup_one_len(MOUNT_CONFIGS_DIR, cfs_fs_pwd(current->fs),
+
strlen(MOUNT_CONFIGS_DIR));
if (IS_ERR(dentry)) {
rc = PTR_ERR(dentry);
CERROR("cannot lookup %s directory: rc = %d\n",
if (IS_ERR(dentry)) {
rc = PTR_ERR(dentry);
CERROR("cannot lookup %s directory: rc = %d\n",
@@
-1150,7
+1146,7
@@
int sptlrpc_target_local_read_conf(struct obd_device *obd,
GOTO(out_close, rc = 0);
}
GOTO(out_close, rc = 0);
}
-
rc = llog_process(llh, local_read_handler, (void *)
conf, NULL);
+
rc = llog_process(NULL, llh, local_read_handler, (void *)
conf, NULL);
if (rc == 0) {
conf->sc_local = 1;
if (rc == 0) {
conf->sc_local = 1;