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-5275 lprocfs: replace LPROCFS with CONFIG_PROC_FS
[fs/lustre-release.git]
/
lustre
/
fid
/
fid_request.c
diff --git
a/lustre/fid/fid_request.c
b/lustre/fid/fid_request.c
index
d0da85e
..
4f7fdf5
100644
(file)
--- a/
lustre/fid/fid_request.c
+++ b/
lustre/fid/fid_request.c
@@
-27,7
+27,7
@@
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 201
3
, Intel Corporation.
+ * Copyright (c) 2011, 201
4
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-42,13
+42,8
@@
#define DEBUG_SUBSYSTEM S_FID
#define DEBUG_SUBSYSTEM S_FID
-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-# include <linux/module.h>
-#else /* __KERNEL__ */
-# include <liblustre.h>
-#endif
-
+#include <linux/module.h>
+#include <libcfs/libcfs.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
@@
-69,6
+64,7
@@
static int seq_client_rpc(struct lu_client_seq *seq,
int rc;
ENTRY;
int rc;
ENTRY;
+ LASSERT(exp != NULL && !IS_ERR(exp));
req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp), &RQF_SEQ_QUERY,
LUSTRE_MDS_VERSION, SEQ_QUERY);
if (req == NULL)
req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp), &RQF_SEQ_QUERY,
LUSTRE_MDS_VERSION, SEQ_QUERY);
if (req == NULL)
@@
-103,19
+99,25
@@
static int seq_client_rpc(struct lu_client_seq *seq,
req->rq_no_delay = req->rq_no_resend = 1;
debug_mask = D_CONSOLE;
} else {
req->rq_no_delay = req->rq_no_resend = 1;
debug_mask = D_CONSOLE;
} else {
- if (seq->lcs_type == LUSTRE_SEQ_METADATA)
+ if (seq->lcs_type == LUSTRE_SEQ_METADATA) {
+ req->rq_reply_portal = MDC_REPLY_PORTAL;
req->rq_request_portal = SEQ_METADATA_PORTAL;
req->rq_request_portal = SEQ_METADATA_PORTAL;
- else
+ } else {
+ req->rq_reply_portal = OSC_REPLY_PORTAL;
req->rq_request_portal = SEQ_DATA_PORTAL;
req->rq_request_portal = SEQ_DATA_PORTAL;
+ }
+
debug_mask = D_INFO;
}
ptlrpc_at_set_req_timeout(req);
debug_mask = D_INFO;
}
ptlrpc_at_set_req_timeout(req);
- if (seq->lcs_type == LUSTRE_SEQ_METADATA)
+ if (
opc != SEQ_ALLOC_SUPER &&
seq->lcs_type == LUSTRE_SEQ_METADATA)
mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
+
rc = ptlrpc_queue_wait(req);
rc = ptlrpc_queue_wait(req);
- if (seq->lcs_type == LUSTRE_SEQ_METADATA)
+
+ if (opc != SEQ_ALLOC_SUPER && seq->lcs_type == LUSTRE_SEQ_METADATA)
mdc_put_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
if (rc)
GOTO(out_req, rc);
mdc_put_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
if (rc)
GOTO(out_req, rc);
@@
-206,7
+208,7
@@
static int seq_client_alloc_meta(const struct lu_env *env,
/* Allocate new sequence for client. */
static int seq_client_alloc_seq(const struct lu_env *env,
/* Allocate new sequence for client. */
static int seq_client_alloc_seq(const struct lu_env *env,
-
struct lu_client_seq *seq, seqno_t
*seqnr)
+
struct lu_client_seq *seq, u64
*seqnr)
{
int rc;
ENTRY;
{
int rc;
ENTRY;
@@
-238,45
+240,45
@@
static int seq_client_alloc_seq(const struct lu_env *env,
}
static int seq_fid_alloc_prep(struct lu_client_seq *seq,
}
static int seq_fid_alloc_prep(struct lu_client_seq *seq,
-
cfs_waitlink
_t *link)
+
wait_queue
_t *link)
{
{
-
if (seq->lcs_update) {
-
cfs_waitq_add
(&seq->lcs_waitq, link);
-
cfs_set_current_state(CFS_TASK_UNINT
);
+ if (seq->lcs_update) {
+
add_wait_queue
(&seq->lcs_waitq, link);
+
set_current_state(TASK_UNINTERRUPTIBLE
);
mutex_unlock(&seq->lcs_mutex);
mutex_unlock(&seq->lcs_mutex);
-
cfs_waitq_wait(link, CFS_TASK_UNINT
);
+
waitq_wait(link, TASK_UNINTERRUPTIBLE
);
mutex_lock(&seq->lcs_mutex);
mutex_lock(&seq->lcs_mutex);
-
cfs_waitq_del
(&seq->lcs_waitq, link);
-
cfs_set_current_state(CFS_
TASK_RUNNING);
-
return -EAGAIN;
-
}
-
++seq->lcs_update;
+
remove_wait_queue
(&seq->lcs_waitq, link);
+
set_current_state(
TASK_RUNNING);
+ return -EAGAIN;
+ }
+ ++seq->lcs_update;
mutex_unlock(&seq->lcs_mutex);
mutex_unlock(&seq->lcs_mutex);
-
return 0;
+ return 0;
}
static void seq_fid_alloc_fini(struct lu_client_seq *seq)
{
}
static void seq_fid_alloc_fini(struct lu_client_seq *seq)
{
-
LASSERT(seq->lcs_update == 1);
+ LASSERT(seq->lcs_update == 1);
mutex_lock(&seq->lcs_mutex);
mutex_lock(&seq->lcs_mutex);
-
--seq->lcs_update;
-
cfs_waitq_signal
(&seq->lcs_waitq);
+ --seq->lcs_update;
+
wake_up
(&seq->lcs_waitq);
}
/**
* Allocate the whole seq to the caller.
**/
int seq_client_get_seq(const struct lu_env *env,
}
/**
* Allocate the whole seq to the caller.
**/
int seq_client_get_seq(const struct lu_env *env,
-
struct lu_client_seq *seq, seqno_t
*seqnr)
+
struct lu_client_seq *seq, u64
*seqnr)
{
{
-
cfs_waitlink
_t link;
-
int rc;
+
wait_queue
_t link;
+ int rc;
-
LASSERT(seqnr != NULL);
+ LASSERT(seqnr != NULL);
mutex_lock(&seq->lcs_mutex);
mutex_lock(&seq->lcs_mutex);
-
cfs_waitlink_ini
t(&link);
+
init_waitqueue_entry_curren
t(&link);
while (1) {
rc = seq_fid_alloc_prep(seq, &link);
while (1) {
rc = seq_fid_alloc_prep(seq, &link);
@@
-318,23
+320,23
@@
EXPORT_SYMBOL(seq_client_get_seq);
/* Allocate new fid on passed client @seq and save it to @fid. */
int seq_client_alloc_fid(const struct lu_env *env,
/* Allocate new fid on passed client @seq and save it to @fid. */
int seq_client_alloc_fid(const struct lu_env *env,
-
struct lu_client_seq *seq, struct lu_fid *fid)
+ struct lu_client_seq *seq, struct lu_fid *fid)
{
{
-
cfs_waitlink
_t link;
-
int rc;
-
ENTRY;
+
wait_queue
_t link;
+ int rc;
+ ENTRY;
-
LASSERT(seq != NULL);
-
LASSERT(fid != NULL);
+ LASSERT(seq != NULL);
+ LASSERT(fid != NULL);
-
cfs_waitlink_ini
t(&link);
+
init_waitqueue_entry_curren
t(&link);
mutex_lock(&seq->lcs_mutex);
if (OBD_FAIL_CHECK(OBD_FAIL_SEQ_EXHAUST))
seq->lcs_fid.f_oid = seq->lcs_width;
while (1) {
mutex_lock(&seq->lcs_mutex);
if (OBD_FAIL_CHECK(OBD_FAIL_SEQ_EXHAUST))
seq->lcs_fid.f_oid = seq->lcs_width;
while (1) {
-
seqno_t
seqnr;
+
u64
seqnr;
if (!fid_is_zero(&seq->lcs_fid) &&
fid_oid(&seq->lcs_fid) < seq->lcs_width) {
if (!fid_is_zero(&seq->lcs_fid) &&
fid_oid(&seq->lcs_fid) < seq->lcs_width) {
@@
-388,23
+390,23
@@
EXPORT_SYMBOL(seq_client_alloc_fid);
*/
void seq_client_flush(struct lu_client_seq *seq)
{
*/
void seq_client_flush(struct lu_client_seq *seq)
{
-
cfs_waitlink
_t link;
+
wait_queue
_t link;
-
LASSERT(seq != NULL);
-
cfs_waitlink_ini
t(&link);
+ LASSERT(seq != NULL);
+
init_waitqueue_entry_curren
t(&link);
mutex_lock(&seq->lcs_mutex);
mutex_lock(&seq->lcs_mutex);
-
while (seq->lcs_update) {
-
cfs_waitq_add
(&seq->lcs_waitq, &link);
-
cfs_set_current_state(CFS_TASK_UNINT
);
+ while (seq->lcs_update) {
+
add_wait_queue
(&seq->lcs_waitq, &link);
+
set_current_state(TASK_UNINTERRUPTIBLE
);
mutex_unlock(&seq->lcs_mutex);
mutex_unlock(&seq->lcs_mutex);
-
cfs_waitq_wait(&link, CFS_TASK_UNINT
);
+
waitq_wait(&link, TASK_UNINTERRUPTIBLE
);
mutex_lock(&seq->lcs_mutex);
mutex_lock(&seq->lcs_mutex);
-
cfs_waitq_del
(&seq->lcs_waitq, &link);
-
cfs_set_current_state(CFS_
TASK_RUNNING);
-
}
+
remove_wait_queue
(&seq->lcs_waitq, &link);
+
set_current_state(
TASK_RUNNING);
+ }
fid_zero(&seq->lcs_fid);
/**
fid_zero(&seq->lcs_fid);
/**
@@
-421,7
+423,7
@@
EXPORT_SYMBOL(seq_client_flush);
static void seq_client_proc_fini(struct lu_client_seq *seq)
{
static void seq_client_proc_fini(struct lu_client_seq *seq)
{
-#ifdef
LPROC
FS
+#ifdef
CONFIG_PROC_
FS
ENTRY;
if (seq->lcs_proc_dir) {
if (!IS_ERR(seq->lcs_proc_dir))
ENTRY;
if (seq->lcs_proc_dir) {
if (!IS_ERR(seq->lcs_proc_dir))
@@
-429,19
+431,18
@@
static void seq_client_proc_fini(struct lu_client_seq *seq)
seq->lcs_proc_dir = NULL;
}
EXIT;
seq->lcs_proc_dir = NULL;
}
EXIT;
-#endif /*
LPROC
FS */
+#endif /*
CONFIG_PROC_
FS */
}
static int seq_client_proc_init(struct lu_client_seq *seq)
{
}
static int seq_client_proc_init(struct lu_client_seq *seq)
{
-#ifdef
LPROC
FS
+#ifdef
CONFIG_PROC_
FS
int rc;
ENTRY;
int rc;
ENTRY;
- seq->lcs_proc_dir = lprocfs_register(seq->lcs_name,
- seq_type_proc_dir,
- NULL, NULL);
-
+ seq->lcs_proc_dir = lprocfs_seq_register(seq->lcs_name,
+ seq_type_proc_dir,
+ NULL, NULL);
if (IS_ERR(seq->lcs_proc_dir)) {
CERROR("%s: LProcFS failed in seq-init\n",
seq->lcs_name);
if (IS_ERR(seq->lcs_proc_dir)) {
CERROR("%s: LProcFS failed in seq-init\n",
seq->lcs_name);
@@
-449,8
+450,8
@@
static int seq_client_proc_init(struct lu_client_seq *seq)
RETURN(rc);
}
RETURN(rc);
}
-
rc = lprocfs
_add_vars(seq->lcs_proc_dir,
- seq_client_proc_list, seq);
+
rc = lprocfs_seq
_add_vars(seq->lcs_proc_dir,
+
seq_client_proc_list, seq);
if (rc) {
CERROR("%s: Can't init sequence manager "
"proc, rc %d\n", seq->lcs_name, rc);
if (rc) {
CERROR("%s: Can't init sequence manager "
"proc, rc %d\n", seq->lcs_name, rc);
@@
-463,9
+464,9
@@
out_cleanup:
seq_client_proc_fini(seq);
return rc;
seq_client_proc_fini(seq);
return rc;
-#else /*
LPROC
FS */
+#else /*
!CONFIG_PROC_
FS */
return 0;
return 0;
-#endif
+#endif
/* CONFIG_PROC_FS */
}
int seq_client_init(struct lu_client_seq *seq,
}
int seq_client_init(struct lu_client_seq *seq,
@@
-489,14
+490,12
@@
int seq_client_init(struct lu_client_seq *seq,
else
seq->lcs_width = LUSTRE_DATA_SEQ_MAX_WIDTH;
else
seq->lcs_width = LUSTRE_DATA_SEQ_MAX_WIDTH;
-
cfs_waitq_init
(&seq->lcs_waitq);
+
init_waitqueue_head
(&seq->lcs_waitq);
/* Make sure that things are clear before work is started. */
seq_client_flush(seq);
if (exp != NULL)
seq->lcs_exp = class_export_get(exp);
/* Make sure that things are clear before work is started. */
seq_client_flush(seq);
if (exp != NULL)
seq->lcs_exp = class_export_get(exp);
- else if (type == LUSTRE_SEQ_METADATA)
- LASSERT(seq->lcs_srv != NULL);
snprintf(seq->lcs_name, sizeof(seq->lcs_name),
"cli-%s", prefix);
snprintf(seq->lcs_name, sizeof(seq->lcs_name),
"cli-%s", prefix);
@@
-571,14
+570,13
@@
int client_fid_fini(struct obd_device *obd)
}
EXPORT_SYMBOL(client_fid_fini);
}
EXPORT_SYMBOL(client_fid_fini);
-#ifdef __KERNEL__
struct proc_dir_entry *seq_type_proc_dir;
static int __init fid_mod_init(void)
{
struct proc_dir_entry *seq_type_proc_dir;
static int __init fid_mod_init(void)
{
- seq_type_proc_dir = lprocfs_register(LUSTRE_SEQ_NAME,
- proc_lustre_root,
- NULL, NULL);
+ seq_type_proc_dir = lprocfs_
seq_
register(LUSTRE_SEQ_NAME,
+
proc_lustre_root,
+
NULL, NULL);
if (IS_ERR(seq_type_proc_dir))
return PTR_ERR(seq_type_proc_dir);
if (IS_ERR(seq_type_proc_dir))
return PTR_ERR(seq_type_proc_dir);
@@
-606,4
+604,3
@@
MODULE_DESCRIPTION("Lustre FID Module");
MODULE_LICENSE("GPL");
cfs_module(fid, "0.1.0", fid_mod_init, fid_mod_exit);
MODULE_LICENSE("GPL");
cfs_module(fid, "0.1.0", fid_mod_init, fid_mod_exit);
-#endif /* __KERNEL__ */