X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Flproc_ptlrpc.c;h=b42c41b2109b221575d371cba03f58d09ff51afa;hb=ca227f930e41c7598c6cf5b563d65fb6605e306f;hp=f1b9972a1c9058e742e6b7ede0689877116fbe68;hpb=962304a1dafb62ed040445559e6bf52241c60f2b;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/lproc_ptlrpc.c b/lustre/ptlrpc/lproc_ptlrpc.c index f1b9972..b42c41b 100644 --- a/lustre/ptlrpc/lproc_ptlrpc.c +++ b/lustre/ptlrpc/lproc_ptlrpc.c @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -100,6 +100,7 @@ struct ll_rpc_opcode { { LDLM_BL_CALLBACK, "ldlm_bl_callback" }, { LDLM_CP_CALLBACK, "ldlm_cp_callback" }, { LDLM_GL_CALLBACK, "ldlm_gl_callback" }, + { LDLM_SET_INFO, "ldlm_set_info" }, { MGS_CONNECT, "mgs_connect" }, { MGS_DISCONNECT, "mgs_disconnect" }, { MGS_EXCEPTION, "mgs_exception" }, @@ -283,12 +284,12 @@ ptlrpc_lprocfs_write_req_history_max(struct file *file, const char *buffer, * hose a kernel by allowing the request history to grow too * far. */ bufpages = (svc->srv_buf_size + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT; - if (val > num_physpages/(2 * bufpages)) + if (val > cfs_num_physpages/(2 * bufpages)) return -ERANGE; - spin_lock(&svc->srv_lock); + cfs_spin_lock(&svc->srv_lock); svc->srv_max_history_rqbds = val; - spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&svc->srv_lock); return count; } @@ -319,9 +320,9 @@ ptlrpc_lprocfs_wr_threads_min(struct file *file, const char *buffer, if (val > svc->srv_threads_max) return -ERANGE; - spin_lock(&svc->srv_lock); + cfs_spin_lock(&svc->srv_lock); svc->srv_threads_min = val; - spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&svc->srv_lock); return count; } @@ -332,7 +333,7 @@ ptlrpc_lprocfs_rd_threads_started(char *page, char **start, off_t off, { struct ptlrpc_service *svc = data; - return snprintf(page, count, "%d\n", svc->srv_threads_started); + return snprintf(page, count, "%d\n", svc->srv_threads_running); } static int @@ -361,9 +362,9 @@ ptlrpc_lprocfs_wr_threads_max(struct file *file, const char *buffer, if (val < svc->srv_threads_min) return -ERANGE; - spin_lock(&svc->srv_lock); + cfs_spin_lock(&svc->srv_lock); svc->srv_threads_max = val; - spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&svc->srv_lock); return count; } @@ -378,7 +379,7 @@ ptlrpc_lprocfs_svc_req_history_seek(struct ptlrpc_service *svc, struct ptlrpc_srh_iterator *srhi, __u64 seq) { - struct list_head *e; + cfs_list_t *e; struct ptlrpc_request *req; if (srhi->srhi_req != NULL && @@ -391,7 +392,7 @@ ptlrpc_lprocfs_svc_req_history_seek(struct ptlrpc_service *svc, * be near the head), we shouldn't have to do long * re-scans */ LASSERT (srhi->srhi_seq == srhi->srhi_req->rq_history_seq); - LASSERT (!list_empty(&svc->srv_request_history)); + LASSERT (!cfs_list_empty(&svc->srv_request_history)); e = &srhi->srhi_req->rq_history_list; } else { /* search from start */ @@ -399,7 +400,7 @@ ptlrpc_lprocfs_svc_req_history_seek(struct ptlrpc_service *svc, } while (e != &svc->srv_request_history) { - req = list_entry(e, struct ptlrpc_request, rq_history_list); + req = cfs_list_entry(e, struct ptlrpc_request, rq_history_list); if (req->rq_history_seq >= seq) { srhi->srhi_seq = req->rq_history_seq; @@ -426,9 +427,9 @@ ptlrpc_lprocfs_svc_req_history_start(struct seq_file *s, loff_t *pos) srhi->srhi_seq = 0; srhi->srhi_req = NULL; - spin_lock(&svc->srv_lock); + cfs_spin_lock(&svc->srv_lock); rc = ptlrpc_lprocfs_svc_req_history_seek(svc, srhi, *pos); - spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&svc->srv_lock); if (rc == 0) { *pos = srhi->srhi_seq; @@ -456,9 +457,9 @@ ptlrpc_lprocfs_svc_req_history_next(struct seq_file *s, struct ptlrpc_srh_iterator *srhi = iter; int rc; - spin_lock(&svc->srv_lock); + cfs_spin_lock(&svc->srv_lock); rc = ptlrpc_lprocfs_svc_req_history_seek(svc, srhi, *pos + 1); - spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&svc->srv_lock); if (rc != 0) { OBD_FREE(srhi, sizeof(*srhi)); @@ -469,7 +470,7 @@ ptlrpc_lprocfs_svc_req_history_next(struct seq_file *s, return srhi; } -/* common ost/mdt srv_request_history_print_fn */ +/* common ost/mdt srv_req_printfn */ void target_print_req(void *seq_file, struct ptlrpc_request *req) { /* Called holding srv_lock with irqs disabled. @@ -506,7 +507,7 @@ static int ptlrpc_lprocfs_svc_req_history_show(struct seq_file *s, void *iter) struct ptlrpc_request *req; int rc; - spin_lock(&svc->srv_lock); + cfs_spin_lock(&svc->srv_lock); rc = ptlrpc_lprocfs_svc_req_history_seek(svc, srhi, srhi->srhi_seq); @@ -526,13 +527,13 @@ static int ptlrpc_lprocfs_svc_req_history_show(struct seq_file *s, void *iter) req->rq_arrival_time.tv_sec, req->rq_sent - req->rq_arrival_time.tv_sec, req->rq_sent - req->rq_deadline); - if (svc->srv_request_history_print_fn == NULL) + if (svc->srv_req_printfn == NULL) seq_printf(s, "\n"); else - svc->srv_request_history_print_fn(s, srhi->srhi_req); + svc->srv_req_printfn(s, srhi->srhi_req); } - spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&svc->srv_lock); return rc; } @@ -610,9 +611,9 @@ static int ptlrpc_lprocfs_wr_hp_ratio(struct file *file, const char *buffer, if (val < 0) return -ERANGE; - spin_lock(&svc->srv_lock); + cfs_spin_lock(&svc->srv_lock); svc->srv_hpreq_ratio = val; - spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&svc->srv_lock); return count; }