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-1996 lustre: Flexible changelog format.
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
llog_client.c
diff --git
a/lustre/ptlrpc/llog_client.c
b/lustre/ptlrpc/llog_client.c
index
fff090e
..
2a30db5
100644
(file)
--- a/
lustre/ptlrpc/llog_client.c
+++ b/
lustre/ptlrpc/llog_client.c
@@
-27,7
+27,7
@@
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012,
Whamcloud, Inc
.
+ * Copyright (c) 2012,
Intel Corporation
.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-42,11
+42,7
@@
#define DEBUG_SUBSYSTEM S_LOG
#define DEBUG_SUBSYSTEM S_LOG
-#ifdef __KERNEL__
#include <libcfs/libcfs.h>
#include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
#include <obd_class.h>
#include <lustre_log.h>
#include <obd_class.h>
#include <lustre_log.h>
@@
-54,7
+50,7
@@
#include <libcfs/list.h>
#define LLOG_CLIENT_ENTRY(ctxt, imp) do { \
#include <libcfs/list.h>
#define LLOG_CLIENT_ENTRY(ctxt, imp) do { \
-
cfs_
mutex_lock(&ctxt->loc_mutex); \
+ mutex_lock(&ctxt->loc_mutex); \
if (ctxt->loc_imp) { \
imp = class_import_get(ctxt->loc_imp); \
} else { \
if (ctxt->loc_imp) { \
imp = class_import_get(ctxt->loc_imp); \
} else { \
@@
-63,19
+59,19
@@
"but I'll try again next time. Not fatal.\n", \
ctxt->loc_idx); \
imp = NULL; \
"but I'll try again next time. Not fatal.\n", \
ctxt->loc_idx); \
imp = NULL; \
-
cfs_
mutex_unlock(&ctxt->loc_mutex); \
+ mutex_unlock(&ctxt->loc_mutex); \
return (-EINVAL); \
} \
return (-EINVAL); \
} \
-
cfs_
mutex_unlock(&ctxt->loc_mutex); \
+ mutex_unlock(&ctxt->loc_mutex); \
} while(0)
#define LLOG_CLIENT_EXIT(ctxt, imp) do { \
} while(0)
#define LLOG_CLIENT_EXIT(ctxt, imp) do { \
-
cfs_
mutex_lock(&ctxt->loc_mutex); \
+ mutex_lock(&ctxt->loc_mutex); \
if (ctxt->loc_imp != imp) \
CWARN("loc_imp has changed from %p to %p\n", \
ctxt->loc_imp, imp); \
class_import_put(imp); \
if (ctxt->loc_imp != imp) \
CWARN("loc_imp has changed from %p to %p\n", \
ctxt->loc_imp, imp); \
class_import_put(imp); \
-
cfs_
mutex_unlock(&ctxt->loc_mutex); \
+ mutex_unlock(&ctxt->loc_mutex); \
} while(0)
/* This is a callback from the llog_* functions.
} while(0)
/* This is a callback from the llog_* functions.