X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_lib.c;h=f0123e026c9196d1c0624af8d5ccee63ac65f1c5;hp=28215524561f3c0efbc73e7853b9ad14e4a3d883;hb=2ad695f40cf1920033d77723311ed5ed7a3b07cc;hpb=cc6ce9c787a9a119ac2df673d68114908c34b0a8 diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index 2821552..f0123e0 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.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. @@ -28,18 +26,14 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. - */ -/* - * Copyright (c) 2011 Whamcloud, Inc. + * + * Copyright (c) 2011, 2012, Whamcloud, 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_LDLM #ifdef __KERNEL__ @@ -48,7 +42,7 @@ # include #endif #include -#include +#include #include #include #include @@ -137,6 +131,7 @@ int client_import_add_conn(struct obd_import *imp, struct obd_uuid *uuid, { return import_set_conn(imp, uuid, priority, 1); } +EXPORT_SYMBOL(client_import_add_conn); int client_import_del_conn(struct obd_import *imp, struct obd_uuid *uuid) { @@ -192,6 +187,7 @@ out: CERROR("connection %s not found\n", uuid->uuid); RETURN(rc); } +EXPORT_SYMBOL(client_import_del_conn); /** * Find conn uuid by peer nid. @peer is a server nid. This function is used @@ -227,6 +223,30 @@ void client_destroy_import(struct obd_import *imp) sptlrpc_import_sec_put(imp); class_import_put(imp); } +EXPORT_SYMBOL(client_destroy_import); + +/** + * check whether the osc is on MDT or not + * In the config log, + * osc on MDT + * setup 0:{fsname}-OSTxxxx-osc[-MDTxxxx] 1:lustre-OST0000_UUID 2:NID + * osc on client + * setup 0:{fsname}-OSTxxxx-osc 1:lustre-OST0000_UUID 2:NID + * + **/ +static int osc_on_mdt(char *obdname) +{ + char *ptr; + + ptr = strrchr(obdname, '-'); + if (ptr == NULL) + return 0; + + if (strncmp(ptr + 1, "MDT", 3) == 0) + return 1; + + return 0; +} /* configure an RPC client OBD device * @@ -248,7 +268,9 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) /* In a more perfect world, we would hang a ptlrpc_client off of * obd_type and just use the values from there. */ - if (!strcmp(name, LUSTRE_OSC_NAME)) { + if (!strcmp(name, LUSTRE_OSC_NAME) || + (!strcmp(name, LUSTRE_OSP_NAME) && + !is_osp_on_ost(lustre_cfg_buf(lcfg, 0)))) { rq_portal = OST_REQUEST_PORTAL; rp_portal = OSC_REPLY_PORTAL; connect_op = OST_CONNECT; @@ -256,7 +278,9 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) cli->cl_sp_to = LUSTRE_SP_OST; ns_type = LDLM_NS_TYPE_OSC; - } else if (!strcmp(name, LUSTRE_MDC_NAME)) { + } else if (!strcmp(name, LUSTRE_MDC_NAME) || + (!strcmp(name, LUSTRE_OSP_NAME) && + is_osp_on_ost(lustre_cfg_buf(lcfg, 0)))) { rq_portal = MDS_REQUEST_PORTAL; rp_portal = MDC_REPLY_PORTAL; connect_op = MDS_CONNECT; @@ -273,6 +297,14 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) cli->cl_flvr_mgc.sf_rpc = SPTLRPC_FLVR_INVALID; ns_type = LDLM_NS_TYPE_MGC; + } else if (!strcmp(name, LUSTRE_OSP_NAME)) { + rq_portal = OST_REQUEST_PORTAL; + rp_portal = OSC_REPLY_PORTAL; + connect_op = OST_CONNECT; + cli->cl_sp_me = LUSTRE_SP_CLI; + cli->cl_sp_to = LUSTRE_SP_OST; + ns_type = LDLM_NS_TYPE_OSC; + } else { CERROR("unknown client OBD type \"%s\", can't setup\n", name); @@ -318,6 +350,8 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) CFS_INIT_LIST_HEAD(&cli->cl_loi_write_list); CFS_INIT_LIST_HEAD(&cli->cl_loi_read_list); client_obd_list_lock_init(&cli->cl_loi_list_lock); + cfs_atomic_set(&cli->cl_pending_w_pages, 0); + cfs_atomic_set(&cli->cl_pending_r_pages, 0); cli->cl_r_in_flight = 0; cli->cl_w_in_flight = 0; @@ -327,6 +361,15 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) cfs_spin_lock_init(&cli->cl_write_page_hist.oh_lock); cfs_spin_lock_init(&cli->cl_read_offset_hist.oh_lock); cfs_spin_lock_init(&cli->cl_write_offset_hist.oh_lock); + + /* lru for osc. */ + CFS_INIT_LIST_HEAD(&cli->cl_lru_osc); + cfs_atomic_set(&cli->cl_lru_shrinkers, 0); + cfs_atomic_set(&cli->cl_lru_busy, 0); + cfs_atomic_set(&cli->cl_lru_in_list, 0); + CFS_INIT_LIST_HEAD(&cli->cl_lru_list); + client_obd_list_lock_init(&cli->cl_lru_list_lock); + cfs_waitq_init(&cli->cl_destroy_waitq); cfs_atomic_set(&cli->cl_destroy_in_flight, 0); #ifdef ENABLE_CHECKSUM @@ -355,9 +398,11 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) } else if (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT) <= 512 /* MB */) { cli->cl_max_rpcs_in_flight = 4; } else { - cli->cl_max_rpcs_in_flight = OSC_MAX_RIF_DEFAULT; + if (osc_on_mdt(obddev->obd_name)) + cli->cl_max_rpcs_in_flight = MDS_OSC_MAX_RIF_DEFAULT; + else + cli->cl_max_rpcs_in_flight = OSC_MAX_RIF_DEFAULT; } - rc = ldlm_get_ref(); if (rc) { CERROR("ldlm_get_ref failed: %d\n", rc); @@ -421,6 +466,7 @@ err: RETURN(rc); } +EXPORT_SYMBOL(client_obd_setup); int client_obd_cleanup(struct obd_device *obddev) { @@ -429,9 +475,12 @@ int client_obd_cleanup(struct obd_device *obddev) ldlm_namespace_free_post(obddev->obd_namespace); obddev->obd_namespace = NULL; + LASSERT(obddev->u.cli.cl_import == NULL); + ldlm_put_ref(); RETURN(0); } +EXPORT_SYMBOL(client_obd_cleanup); /* ->o_connect() method for client side (OSC and MDC and MGC) */ int client_connect_import(const struct lu_env *env, @@ -500,6 +549,7 @@ out_sem: return rc; } +EXPORT_SYMBOL(client_connect_import); int client_disconnect_export(struct obd_export *exp) { @@ -561,13 +611,6 @@ int client_disconnect_export(struct obd_export *exp) ptlrpc_invalidate_import(imp); - if (imp->imp_rq_pool) { - ptlrpc_free_rq_pool(imp->imp_rq_pool); - imp->imp_rq_pool = NULL; - } - client_destroy_import(imp); - cli->cl_import = NULL; - EXIT; out_disconnect: @@ -581,7 +624,9 @@ int client_disconnect_export(struct obd_export *exp) RETURN(rc); } +EXPORT_SYMBOL(client_disconnect_export); +#ifdef HAVE_SERVER_SUPPORT int server_disconnect_export(struct obd_export *exp) { int rc; @@ -602,19 +647,22 @@ int server_disconnect_export(struct obd_export *exp) struct ptlrpc_reply_state *rs = cfs_list_entry(exp->exp_outstanding_replies.next, struct ptlrpc_reply_state, rs_exp_list); - struct ptlrpc_service *svc = rs->rs_service; + struct ptlrpc_service_part *svcpt = rs->rs_svcpt; - cfs_spin_lock(&svc->srv_rs_lock); - cfs_list_del_init(&rs->rs_exp_list); - cfs_spin_lock(&rs->rs_lock); - ptlrpc_schedule_difficult_reply(rs); - cfs_spin_unlock(&rs->rs_lock); - cfs_spin_unlock(&svc->srv_rs_lock); - } - cfs_spin_unlock(&exp->exp_lock); + cfs_spin_lock(&svcpt->scp_rep_lock); - RETURN(rc); + cfs_list_del_init(&rs->rs_exp_list); + cfs_spin_lock(&rs->rs_lock); + ptlrpc_schedule_difficult_reply(rs); + cfs_spin_unlock(&rs->rs_lock); + + cfs_spin_unlock(&svcpt->scp_rep_lock); + } + cfs_spin_unlock(&exp->exp_lock); + + RETURN(rc); } +EXPORT_SYMBOL(server_disconnect_export); /* -------------------------------------------------------------------------- * from old lib/target.c @@ -625,24 +673,49 @@ static int target_handle_reconnect(struct lustre_handle *conn, struct obd_uuid *cluuid) { ENTRY; + if (exp->exp_connection && exp->exp_imp_reverse) { struct lustre_handle *hdl; + struct obd_device *target; + hdl = &exp->exp_imp_reverse->imp_remote_handle; + target = exp->exp_obd; + /* Might be a re-connect after a partition. */ if (!memcmp(&conn->cookie, &hdl->cookie, sizeof conn->cookie)) { - CWARN("%s: %s reconnecting\n", exp->exp_obd->obd_name, - cluuid->uuid); + if (target->obd_recovering) { + int timeout = cfs_duration_sec(cfs_time_sub( + cfs_timer_deadline( + &target->obd_recovery_timer), + cfs_time_current())); + + LCONSOLE_WARN("%s: Client %s (at %s) reconnect" + "ing, waiting for %d clients in recov" + "ery for %d:%.02d\n", target->obd_name, + obd_uuid2str(&exp->exp_client_uuid), + obd_export_nid2str(exp), + target->obd_max_recoverable_clients, + timeout / 60, timeout % 60); + } else { + LCONSOLE_WARN("%s: Client %s (at %s) " + "reconnecting\n", target->obd_name, + obd_uuid2str(&exp->exp_client_uuid), + obd_export_nid2str(exp)); + } + conn->cookie = exp->exp_handle.h_cookie; /* target_handle_connect() treats EALREADY and * -EALREADY differently. EALREADY means we are * doing a valid reconnect from the same client. */ RETURN(EALREADY); } else { - CERROR("%s reconnecting from %s, " - "handle mismatch (ours "LPX64", theirs " - LPX64")\n", cluuid->uuid, - exp->exp_connection->c_remote_uuid.uuid, - hdl->cookie, conn->cookie); + LCONSOLE_WARN("%s: already connected client %s (at %s) " + "with handle "LPX64". Rejecting client " + "with the same UUID trying to reconnect " + "with handle "LPX64"\n", target->obd_name, + obd_uuid2str(&exp->exp_client_uuid), + obd_export_nid2str(exp), + hdl->cookie, conn->cookie); memset(conn, 0, sizeof *conn); /* target_handle_connect() treats EALREADY and * -EALREADY differently. -EALREADY is an error @@ -686,9 +759,10 @@ check_and_start_recovery_timer(struct obd_device *obd, int target_handle_connect(struct ptlrpc_request *req) { - struct obd_device *target, *targref = NULL; + struct obd_device *target = NULL, *targref = NULL; struct obd_export *export = NULL; struct obd_import *revimp; + struct obd_import *tmp_imp = NULL; struct lustre_handle conn; struct lustre_handle *tmp; struct obd_uuid tgtuuid; @@ -696,11 +770,13 @@ int target_handle_connect(struct ptlrpc_request *req) struct obd_uuid remote_uuid; char *str; int rc = 0; - int mds_conn = 0; + char *target_start; + int target_len; + bool mds_conn = false, lw_client = false; struct obd_connect_data *data, *tmpdata; int size, tmpsize; lnet_nid_t *client_nid = NULL; - ENTRY; + ENTRY; OBD_RACE(OBD_FAIL_TGT_CONN_RACE); @@ -715,17 +791,30 @@ int target_handle_connect(struct ptlrpc_request *req) if (!target) target = class_name2obd(str); - if (!target || target->obd_stopping || !target->obd_set_up) { - LCONSOLE_ERROR_MSG(0x137, "UUID '%s' is not available " - "for connect (%s)\n", str, - !target ? "no target" : - (target->obd_stopping ? "stopping" : - "not set up")); - GOTO(out, rc = -ENODEV); - } + if (!target) { + deuuidify(str, NULL, &target_start, &target_len); + LCONSOLE_ERROR_MSG(0x137, "UUID '%s' is not available for " + "connect (no target)\n", str); + GOTO(out, rc = -ENODEV); + } + + cfs_spin_lock(&target->obd_dev_lock); + if (target->obd_stopping || !target->obd_set_up) { + cfs_spin_unlock(&target->obd_dev_lock); + + deuuidify(str, NULL, &target_start, &target_len); + LCONSOLE_ERROR_MSG(0x137, "%.*s: Not available for connect " + "from %s (%s)\n", target_len, target_start, + libcfs_nid2str(req->rq_peer.nid), + (target->obd_stopping ? + "stopping" : "not set up")); + GOTO(out, rc = -ENODEV); + } if (target->obd_no_conn) { - LCONSOLE_WARN("%s: temporarily refusing client connection " + cfs_spin_unlock(&target->obd_dev_lock); + + LCONSOLE_WARN("%s: Temporarily refusing client connection " "from %s\n", target->obd_name, libcfs_nid2str(req->rq_peer.nid)); GOTO(out, rc = -EAGAIN); @@ -736,6 +825,8 @@ int target_handle_connect(struct ptlrpc_request *req) Really, class_uuid2obd should take the ref. */ targref = class_incref(target, __FUNCTION__, cfs_current()); + target->obd_conn_inprogress++; + cfs_spin_unlock(&target->obd_dev_lock); str = req_capsule_client_get(&req->rq_pill, &RMF_CLUUID); if (str == NULL) { @@ -807,7 +898,10 @@ int target_handle_connect(struct ptlrpc_request *req) if ((lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_INITIAL) && (data->ocd_connect_flags & OBD_CONNECT_MDS)) - mds_conn = 1; + mds_conn = true; + + if ((data->ocd_connect_flags & OBD_CONNECT_LIGHTWEIGHT) != 0) + lw_client = true; /* lctl gets a backstage, all-access pass. */ if (obd_uuid_equals(&cluuid, &target->obd_uuid)) @@ -818,23 +912,29 @@ int target_handle_connect(struct ptlrpc_request *req) goto no_export; /* we've found an export in the hash */ + + cfs_spin_lock(&export->exp_lock); + if (export->exp_connecting) { /* bug 9635, et. al. */ - CWARN("%s: exp %p already connecting\n", - export->exp_obd->obd_name, export); + cfs_spin_unlock(&export->exp_lock); + LCONSOLE_WARN("%s: Export %p already connecting from %s\n", + export->exp_obd->obd_name, export, + libcfs_nid2str(req->rq_peer.nid)); class_export_put(export); export = NULL; rc = -EALREADY; } else if (mds_conn && export->exp_connection) { + cfs_spin_unlock(&export->exp_lock); if (req->rq_peer.nid != export->exp_connection->c_peer.nid) /* mds reconnected after failover */ - CWARN("%s: received MDS connection from NID %s," - " removing former export from NID %s\n", + LCONSOLE_WARN("%s: Received MDS connection from " + "%s, removing former export from %s\n", target->obd_name, libcfs_nid2str(req->rq_peer.nid), libcfs_nid2str(export->exp_connection->c_peer.nid)); else /* new mds connection from the same nid */ - CWARN("%s: received new MDS connection from NID %s," - " removing former export from same NID\n", + LCONSOLE_WARN("%s: Received new MDS connection from " + "%s, removing former export from same NID\n", target->obd_name, libcfs_nid2str(req->rq_peer.nid)); class_fail_export(export); class_export_put(export); @@ -844,25 +944,25 @@ int target_handle_connect(struct ptlrpc_request *req) req->rq_peer.nid != export->exp_connection->c_peer.nid && (lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_INITIAL)) { + cfs_spin_unlock(&export->exp_lock); /* in mds failover we have static uuid but nid can be * changed*/ - CWARN("%s: cookie %s seen on new NID %s when " - "existing NID %s is already connected\n", - target->obd_name, cluuid.uuid, - libcfs_nid2str(req->rq_peer.nid), - libcfs_nid2str(export->exp_connection->c_peer.nid)); + LCONSOLE_WARN("%s: Client %s seen on new nid %s when " + "existing nid %s is already connected\n", + target->obd_name, cluuid.uuid, + libcfs_nid2str(req->rq_peer.nid), + libcfs_nid2str( + export->exp_connection->c_peer.nid)); rc = -EALREADY; class_export_put(export); export = NULL; } else { - cfs_spin_lock(&export->exp_lock); - export->exp_connecting = 1; - cfs_spin_unlock(&export->exp_lock); - class_export_put(export); - LASSERT(export->exp_obd == target); + export->exp_connecting = 1; + cfs_spin_unlock(&export->exp_lock); + LASSERT(export->exp_obd == target); - rc = target_handle_reconnect(&conn, export, &cluuid); - } + rc = target_handle_reconnect(&conn, export, &cluuid); + } /* If we found an export, we already unlocked. */ if (!export) { @@ -870,18 +970,20 @@ no_export: OBD_FAIL_TIMEOUT(OBD_FAIL_TGT_DELAY_CONNECT, 2 * obd_timeout); } else if (req->rq_export == NULL && cfs_atomic_read(&export->exp_rpc_count) > 0) { - CWARN("%s: refuse connection from %s/%s to 0x%p/%d\n", - target->obd_name, cluuid.uuid, - libcfs_nid2str(req->rq_peer.nid), - export, cfs_atomic_read(&export->exp_refcount)); + LCONSOLE_WARN("%s: Client %s (at %s) refused connection, " + "still busy with %d references\n", + target->obd_name, cluuid.uuid, + libcfs_nid2str(req->rq_peer.nid), + cfs_atomic_read(&export->exp_refcount)); GOTO(out, rc = -EBUSY); } else if (req->rq_export != NULL && (cfs_atomic_read(&export->exp_rpc_count) > 1)) { /* the current connect rpc has increased exp_rpc_count */ - CWARN("%s: refuse reconnection from %s@%s to 0x%p/%d\n", - target->obd_name, cluuid.uuid, - libcfs_nid2str(req->rq_peer.nid), - export, cfs_atomic_read(&export->exp_rpc_count) - 1); + LCONSOLE_WARN("%s: Client %s (at %s) refused reconnection, " + "still busy with %d active RPCs\n", + target->obd_name, cluuid.uuid, + libcfs_nid2str(req->rq_peer.nid), + cfs_atomic_read(&export->exp_rpc_count) - 1); cfs_spin_lock(&export->exp_lock); if (req->rq_export->exp_conn_cnt < lustre_msg_get_conn_cnt(req->rq_reqmsg)) @@ -890,9 +992,12 @@ no_export: cfs_spin_unlock(&export->exp_lock); GOTO(out, rc = -EBUSY); } else if (lustre_msg_get_conn_cnt(req->rq_reqmsg) == 1) { - CERROR("%s: NID %s (%s) reconnected with 1 conn_cnt; " - "cookies not random?\n", target->obd_name, - libcfs_nid2str(req->rq_peer.nid), cluuid.uuid); + if (!strstr(cluuid.uuid, "mdt")) + LCONSOLE_WARN("%s: Rejecting reconnect from the " + "known client %s (at %s) because it " + "is indicating it is a new client", + target->obd_name, cluuid.uuid, + libcfs_nid2str(req->rq_peer.nid)); GOTO(out, rc = -EALREADY); } else { OBD_FAIL_TIMEOUT(OBD_FAIL_TGT_DELAY_RECONNECT, 2 * obd_timeout); @@ -902,15 +1007,15 @@ no_export: GOTO(out, rc); } - CWARN("%s: connection from %s@%s %st"LPU64" exp %p cur %ld last %ld\n", + CDEBUG(D_HA, "%s: connection from %s@%s %st"LPU64" exp %p cur %ld last %ld\n", target->obd_name, cluuid.uuid, libcfs_nid2str(req->rq_peer.nid), target->obd_recovering ? "recovering/" : "", data->ocd_transno, export, (long)cfs_time_current_sec(), export ? (long)export->exp_last_request_time : 0); /* If this is the first time a client connects, reset the recovery - * timer */ - if (rc == 0 && target->obd_recovering) + * timer. Discard lightweight connections which might be local */ + if (!lw_client && rc == 0 && target->obd_recovering) check_and_start_recovery_timer(target, req, export == NULL); /* We want to handle EALREADY but *not* -EALREADY from @@ -928,18 +1033,27 @@ no_export: client_nid = &req->rq_peer.nid; if (export == NULL) { - if (target->obd_recovering) { + /* allow lightweight connections during recovery */ + if (target->obd_recovering && !lw_client) { cfs_time_t t; - - t = cfs_timer_deadline(&target->obd_recovery_timer); - t = cfs_time_sub(t, cfs_time_current()); - CERROR("%s: denying connection for new client %s (%s): " - "%d clients in recovery for "CFS_TIME_T"s\n", - target->obd_name, - libcfs_nid2str(req->rq_peer.nid), cluuid.uuid, - cfs_atomic_read(&target-> \ - obd_lock_replay_clients), - cfs_duration_sec(t)); + int c; /* connected */ + int i; /* in progress */ + int k; /* known */ + + c = cfs_atomic_read(&target->obd_connected_clients); + i = cfs_atomic_read(&target->obd_lock_replay_clients); + k = target->obd_max_recoverable_clients; + t = cfs_timer_deadline(&target->obd_recovery_timer); + t = cfs_time_sub(t, cfs_time_current()); + t = cfs_duration_sec(t); + LCONSOLE_WARN("%s: Denying connection for new client " + "%s (at %s), waiting for all %d known " + "clients (%d recovered, %d in progress, " + "and %d unseen) to recover in %d:%.02d\n", + target->obd_name, cluuid.uuid, + libcfs_nid2str(req->rq_peer.nid), k, + c - i, i, k - c, (int)t / 60, + (int)t % 60); rc = -EBUSY; } else { dont_check_exports: @@ -952,13 +1066,24 @@ dont_check_exports: } else { rc = obd_reconnect(req->rq_svc_thread->t_env, export, target, &cluuid, data, client_nid); - if (rc == 0) - /* prevous done via class_conn2export */ - class_export_get(export); } if (rc) GOTO(out, rc); +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 50, 0) + /* 2.2.0 clients always swab nidtbl entries due to a bug, so server + * will do the swabbing for if the client is using the same endianness. + * + * This fixup is version-limited, because we don't want to carry the + * OBD_CONNECT_MNE_SWAB flag around forever, just so long as we need + * interop with unpatched 2.2 clients. For newer clients, servers + * will never do MNE swabbing, let the client handle that. LU-1644 */ + export->exp_need_mne_swab = !ptlrpc_req_need_swab(req) && + !(data->ocd_connect_flags & OBD_CONNECT_MNE_SWAB); +#else +#warning "LU-1644: Remove old OBD_CONNECT_MNE_SWAB fixup and exp_need_mne_swab" +#endif + LASSERT(target->u.obt.obt_magic == OBT_MAGIC); data->ocd_instance = target->u.obt.obt_instance; @@ -990,12 +1115,14 @@ dont_check_exports: if (req->rq_export != NULL) class_export_put(req->rq_export); - req->rq_export = export; + /* request takes one export refcount */ + req->rq_export = class_export_get(export); cfs_spin_lock(&export->exp_lock); if (export->exp_conn_cnt >= lustre_msg_get_conn_cnt(req->rq_reqmsg)) { cfs_spin_unlock(&export->exp_lock); - CERROR("%s: %s already connected at higher conn_cnt: %d > %d\n", + CDEBUG(D_RPCTRACE, "%s: %s already connected at higher " + "conn_cnt: %d > %d\n", cluuid.uuid, libcfs_nid2str(req->rq_peer.nid), export->exp_conn_cnt, lustre_msg_get_conn_cnt(req->rq_reqmsg)); @@ -1038,11 +1165,17 @@ dont_check_exports: &export->exp_nid_hash); } - if (target->obd_recovering && !export->exp_in_recovery) { + if (target->obd_recovering && !export->exp_in_recovery && !lw_client) { int has_transno; __u64 transno = data->ocd_transno; cfs_spin_lock(&export->exp_lock); + /* possible race with class_disconnect_stale_exports, + * export may be already in the eviction process */ + if (export->exp_failed) { + cfs_spin_unlock(&export->exp_lock); + GOTO(out, rc = -ENODEV); + } export->exp_in_recovery = 1; export->exp_req_replay_needed = 1; export->exp_lock_replay_needed = 1; @@ -1072,28 +1205,31 @@ dont_check_exports: } /* Tell the client we're in recovery, when client is involved in it. */ - if (target->obd_recovering) + if (target->obd_recovering && !lw_client) lustre_msg_add_op_flags(req->rq_repmsg, MSG_CONNECT_RECOVERING); tmp = req_capsule_client_get(&req->rq_pill, &RMF_CONN); conn = *tmp; - if (export->exp_imp_reverse != NULL) { - /* destroyed import can be still referenced in ctxt */ - obd_set_info_async(export, sizeof(KEY_REVIMP_UPD), - KEY_REVIMP_UPD, 0, NULL, NULL); - - client_destroy_import(export->exp_imp_reverse); - } - - /* for the rest part, we return -ENOTCONN in case of errors - * in order to let client initialize connection again. - */ - revimp = export->exp_imp_reverse = class_new_import(target); - if (!revimp) { - CERROR("fail to alloc new reverse import.\n"); - GOTO(out, rc = -ENOTCONN); - } + /* for the rest part, we return -ENOTCONN in case of errors + * in order to let client initialize connection again. + */ + revimp = class_new_import(target); + if (revimp == NULL) { + CERROR("fail to alloc new reverse import.\n"); + GOTO(out, rc = -ENOTCONN); + } + + cfs_spin_lock(&export->exp_lock); + if (export->exp_imp_reverse != NULL) { + /* destroyed import can be still referenced in ctxt */ + obd_set_info_async(req->rq_svc_thread->t_env, export, + sizeof(KEY_REVIMP_UPD), KEY_REVIMP_UPD, + 0, NULL, NULL); + tmp_imp = export->exp_imp_reverse; + } + export->exp_imp_reverse = revimp; + cfs_spin_unlock(&export->exp_lock); revimp->imp_connection = ptlrpc_connection_addref(export->exp_connection); revimp->imp_client = &export->exp_obd->obd_ldlm_client; @@ -1117,26 +1253,39 @@ dont_check_exports: else revimp->imp_msghdr_flags &= ~MSGHDR_CKSUM_INCOMPAT18; - rc = sptlrpc_import_sec_adapt(revimp, req->rq_svc_ctx, &req->rq_flvr); - if (rc) { - CERROR("Failed to get sec for reverse import: %d\n", rc); - export->exp_imp_reverse = NULL; - class_destroy_import(revimp); - } + rc = sptlrpc_import_sec_adapt(revimp, req->rq_svc_ctx, &req->rq_flvr); + if (rc) { + CERROR("Failed to get sec for reverse import: %d\n", rc); + cfs_spin_lock(&export->exp_lock); + export->exp_imp_reverse = NULL; + cfs_spin_unlock(&export->exp_lock); + class_destroy_import(revimp); + } + + class_import_put(revimp); - class_import_put(revimp); out: + if (tmp_imp != NULL) + client_destroy_import(tmp_imp); if (export) { cfs_spin_lock(&export->exp_lock); export->exp_connecting = 0; cfs_spin_unlock(&export->exp_lock); + + class_export_put(export); } - if (targref) + if (targref) { + cfs_spin_lock(&target->obd_dev_lock); + target->obd_conn_inprogress--; + cfs_spin_unlock(&target->obd_dev_lock); + class_decref(targref, __FUNCTION__, cfs_current()); + } if (rc) req->rq_status = rc; RETURN(rc); } +EXPORT_SYMBOL(target_handle_connect); int target_handle_disconnect(struct ptlrpc_request *req) { @@ -1152,19 +1301,28 @@ int target_handle_disconnect(struct ptlrpc_request *req) RETURN(0); } +EXPORT_SYMBOL(target_handle_disconnect); void target_destroy_export(struct obd_export *exp) { - /* exports created from last_rcvd data, and "fake" - exports created by lctl don't have an import */ - if (exp->exp_imp_reverse != NULL) - client_destroy_import(exp->exp_imp_reverse); - - LASSERT_ATOMIC_ZERO(&exp->exp_locks_count); - LASSERT_ATOMIC_ZERO(&exp->exp_rpc_count); - LASSERT_ATOMIC_ZERO(&exp->exp_cb_count); - LASSERT_ATOMIC_ZERO(&exp->exp_replay_count); + struct obd_import *imp = NULL; + /* exports created from last_rcvd data, and "fake" + exports created by lctl don't have an import */ + cfs_spin_lock(&exp->exp_lock); + if (exp->exp_imp_reverse != NULL) { + imp = exp->exp_imp_reverse; + exp->exp_imp_reverse = NULL; + } + cfs_spin_unlock(&exp->exp_lock); + if (imp != NULL) + client_destroy_import(imp); + + LASSERT_ATOMIC_ZERO(&exp->exp_locks_count); + LASSERT_ATOMIC_ZERO(&exp->exp_rpc_count); + LASSERT_ATOMIC_ZERO(&exp->exp_cb_count); + LASSERT_ATOMIC_ZERO(&exp->exp_replay_count); } +EXPORT_SYMBOL(target_destroy_export); /* * Recovery functions @@ -1237,17 +1395,20 @@ static void target_exp_dequeue_req_replay(struct ptlrpc_request *req) #ifdef __KERNEL__ static void target_finish_recovery(struct obd_device *obd) { - time_t elapsed_time = max_t(time_t, 1, cfs_time_current_sec() - - obd->obd_recovery_start); ENTRY; - LCONSOLE_INFO("%s: Recovery over after %d:%.02d, of %d clients " - "%d recovered and %d %s evicted.\n", obd->obd_name, - (int)elapsed_time / 60, (int)elapsed_time % 60, - obd->obd_max_recoverable_clients, - cfs_atomic_read(&obd->obd_connected_clients), - obd->obd_stale_clients, - obd->obd_stale_clients == 1 ? "was" : "were"); + /* only log a recovery message when recovery has occurred */ + if (obd->obd_recovery_start) { + time_t elapsed_time = max_t(time_t, 1, cfs_time_current_sec() - + obd->obd_recovery_start); + LCONSOLE_INFO("%s: Recovery over after %d:%.02d, of %d clients " + "%d recovered and %d %s evicted.\n", obd->obd_name, + (int)elapsed_time / 60, (int)elapsed_time % 60, + obd->obd_max_recoverable_clients, + cfs_atomic_read(&obd->obd_connected_clients), + obd->obd_stale_clients, + obd->obd_stale_clients == 1 ? "was" : "were"); + } ldlm_reprocess_all_ns(obd->obd_namespace); cfs_spin_lock(&obd->obd_recovery_task_lock); @@ -1367,6 +1528,7 @@ void target_cleanup_recovery(struct obd_device *obd) EXIT; } +EXPORT_SYMBOL(target_cleanup_recovery); /* obd_recovery_task_lock should be held */ void target_cancel_recovery_timer(struct obd_device *obd) @@ -1374,6 +1536,7 @@ void target_cancel_recovery_timer(struct obd_device *obd) CDEBUG(D_HA, "%s: cancel recovery timer\n", obd->obd_name); cfs_timer_disarm(&obd->obd_recovery_timer); } +EXPORT_SYMBOL(target_cancel_recovery_timer); static void target_start_recovery_timer(struct obd_device *obd) { @@ -1408,34 +1571,46 @@ static void target_start_recovery_timer(struct obd_device *obd) (obd->obd_max_recoverable_clients == 1) ? "s": ""); } -/* extend recovery window to have extra @duration seconds at least. */ -static void extend_recovery_timer(struct obd_device *obd, int drt) +/** + * extend recovery window. + * + * if @extend is true, extend recovery window to have @drt remaining at least; + * otherwise, make sure the recovery timeout value is not less than @drt. + */ +static void extend_recovery_timer(struct obd_device *obd, int drt, bool extend) { cfs_time_t now; cfs_time_t end; cfs_duration_t left; + int to; cfs_spin_lock(&obd->obd_dev_lock); if (!obd->obd_recovering || obd->obd_abort_recovery) { cfs_spin_unlock(&obd->obd_dev_lock); return; } - LASSERT(obd->obd_recovery_start != 0); - now = cfs_time_current_sec(); - end = obd->obd_recovery_start + obd->obd_recovery_timeout; + now = cfs_time_current_sec(); + to = obd->obd_recovery_timeout; + end = obd->obd_recovery_start + to; left = cfs_time_sub(end, now); - if (left < 0) { - obd->obd_recovery_timeout += drt - left; - } else if (left < drt) { - drt -= left; - obd->obd_recovery_timeout += drt; - } else { - drt = left; + + if (extend && (drt > left)) { + to += drt - left; + } else if (!extend && (drt > to)) { + to = drt; + /* reduce drt by already passed time */ + drt -= obd->obd_recovery_timeout - left; } - cfs_timer_arm(&obd->obd_recovery_timer, cfs_time_shift(drt)); + if (to > obd->obd_recovery_time_hard) + to = obd->obd_recovery_time_hard; + if (obd->obd_recovery_timeout < to) { + obd->obd_recovery_timeout = to; + cfs_timer_arm(&obd->obd_recovery_timer, + cfs_time_shift(drt)); + } cfs_spin_unlock(&obd->obd_dev_lock); CDEBUG(D_HA, "%s: recovery timer will expire in %u seconds\n", @@ -1465,7 +1640,7 @@ check_and_start_recovery_timer(struct obd_device *obd, if (!new_client && service_time) /* Teach server about old server's estimates, as first guess * at how long new requests will take. */ - at_measured(&req->rq_rqbd->rqbd_service->srv_at_estimate, + at_measured(&req->rq_rqbd->rqbd_svcpt->scp_at_estimate, service_time); target_start_recovery_timer(obd); @@ -1481,12 +1656,11 @@ check_and_start_recovery_timer(struct obd_device *obd, LASSERT(obt->obt_magic == OBT_MAGIC); lsi = s2lsi(obt->obt_sb); - if (!(lsi->lsi_flags | LSI_IR_CAPABLE)) + if (!(lsi->lsi_flags | LDD_F_IR_CAPABLE)) service_time += 2 * (CONNECTION_SWITCH_MAX + CONNECTION_SWITCH_INC); - service_time -= obd->obd_recovery_timeout; - if (service_time > 0) - extend_recovery_timer(obd, service_time); + if (service_time > obd->obd_recovery_timeout && !new_client) + extend_recovery_timer(obd, service_time, false); } /** Health checking routines */ @@ -1640,8 +1814,8 @@ repeat: } else if (obd->obd_recovery_expired) { obd->obd_recovery_expired = 0; /** If some clients died being recovered, evict them */ - CDEBUG(D_WARNING, - "recovery is timed out, evict stale exports\n"); + LCONSOLE_WARN("%s: recovery is timed out, " + "evict stale exports\n", obd->obd_name); /** evict cexports with no replay in queue, they are stalled */ class_disconnect_stale_exports(obd, health_check); /** continue with VBR */ @@ -1652,7 +1826,7 @@ repeat: * reset timer, recovery will proceed with versions now, * timeout is set just to handle reconnection delays */ - extend_recovery_timer(obd, RECONNECT_DELAY_MAX); + extend_recovery_timer(obd, RECONNECT_DELAY_MAX, true); /** Wait for recovery events again, after evicting bad clients */ goto repeat; } @@ -1776,9 +1950,22 @@ static int handle_recovery_req(struct ptlrpc_thread *thread, * Add request timeout to the recovery time so next request from * this client may come in recovery time */ - if (!AT_OFF) - to = lustre_msg_get_timeout(req->rq_reqmsg); - extend_recovery_timer(class_exp2obd(req->rq_export), to); + if (!AT_OFF) { + struct ptlrpc_service_part *svcpt; + + svcpt = req->rq_rqbd->rqbd_svcpt; + /* If the server sent early reply for this request, + * the client will recalculate the timeout according to + * current server estimate service time, so we will + * use the maxium timeout here for waiting the client + * sending the next req */ + to = max((int)at_est2timeout( + at_get(&svcpt->scp_at_estimate)), + (int)lustre_msg_get_timeout(req->rq_reqmsg)); + /* Add net_latency (see ptlrpc_replay_req) */ + to += lustre_msg_get_service_time(req->rq_reqmsg); + } + extend_recovery_timer(class_exp2obd(req->rq_export), to, true); } reqcopy_put: RETURN(rc); @@ -1792,8 +1979,8 @@ static int target_recovery_thread(void *arg) struct target_recovery_data *trd = &obd->obd_recovery_data; unsigned long delta; unsigned long flags; - struct lu_env env; - struct ptlrpc_thread fake_svc_thread, *thread = &fake_svc_thread; + struct lu_env *env; + struct ptlrpc_thread *thread = NULL; int rc = 0; ENTRY; @@ -1804,14 +1991,28 @@ static int target_recovery_thread(void *arg) RECALC_SIGPENDING; SIGNAL_MASK_UNLOCK(current, flags); - rc = lu_context_init(&env.le_ctx, LCT_MD_THREAD); - if (rc) + OBD_ALLOC_PTR(thread); + if (thread == NULL) + RETURN(-ENOMEM); + + OBD_ALLOC_PTR(env); + if (env == NULL) { + OBD_FREE_PTR(thread); + RETURN(-ENOMEM); + } + + rc = lu_context_init(&env->le_ctx, LCT_MD_THREAD | LCT_DT_THREAD); + if (rc) { + OBD_FREE_PTR(thread); + OBD_FREE_PTR(env); RETURN(rc); + } - thread->t_env = &env; + thread->t_env = env; thread->t_id = -1; /* force filter_iobuf_get/put to use local buffers */ - env.le_ctx.lc_thread = thread; + env->le_ctx.lc_thread = thread; thread->t_data = NULL; + thread->t_watchdog = NULL; CDEBUG(D_HA, "%s: started recovery thread pid %d\n", obd->obd_name, cfs_curproc_pid()); @@ -1902,9 +2103,12 @@ static int target_recovery_thread(void *arg) target_finish_recovery(obd); - lu_context_fini(&env.le_ctx); + lu_context_fini(&env->le_ctx); trd->trd_processing_task = 0; cfs_complete(&trd->trd_finishing); + + OBD_FREE_PTR(thread); + OBD_FREE_PTR(env); RETURN(rc); } @@ -1944,6 +2148,7 @@ void target_stop_recovery_thread(struct obd_device *obd) cfs_wait_for_completion(&trd->trd_finishing); } } +EXPORT_SYMBOL(target_stop_recovery_thread); void target_recovery_fini(struct obd_device *obd) { @@ -1988,7 +2193,7 @@ void target_recovery_init(struct lu_target *lut, svc_handler_t handler) } EXPORT_SYMBOL(target_recovery_init); -#endif +#endif /* __KERNEL__ */ static int target_process_req_flags(struct obd_device *obd, struct ptlrpc_request *req) @@ -2097,8 +2302,9 @@ int target_queue_recovery_request(struct ptlrpc_request *req, * Also, a resent, replayed request that has already been * handled will pass through here and be processed immediately. */ - CWARN("Next recovery transno: "LPU64", current: "LPU64", replaying\n", - obd->obd_next_recovery_transno, transno); + CDEBUG(D_HA, "Next recovery transno: "LPU64 + ", current: "LPU64", replaying\n", + obd->obd_next_recovery_transno, transno); cfs_spin_lock(&obd->obd_recovery_task_lock); if (transno < obd->obd_next_recovery_transno) { /* Processing the queue right now, don't re-add. */ @@ -2156,6 +2362,33 @@ int target_queue_recovery_request(struct ptlrpc_request *req, cfs_waitq_signal(&obd->obd_next_transno_waitq); RETURN(0); } +EXPORT_SYMBOL(target_queue_recovery_request); + +int target_handle_ping(struct ptlrpc_request *req) +{ + obd_ping(req->rq_svc_thread->t_env, req->rq_export); + return req_capsule_server_pack(&req->rq_pill); +} +EXPORT_SYMBOL(target_handle_ping); + +void target_committed_to_req(struct ptlrpc_request *req) +{ + struct obd_export *exp = req->rq_export; + + if (!exp->exp_obd->obd_no_transno && req->rq_repmsg != NULL) + lustre_msg_set_last_committed(req->rq_repmsg, + exp->exp_last_committed); + else + DEBUG_REQ(D_IOCTL, req, "not sending last_committed update (%d/" + "%d)", exp->exp_obd->obd_no_transno, + req->rq_repmsg == NULL); + + CDEBUG(D_INFO, "last_committed "LPU64", transno "LPU64", xid "LPU64"\n", + exp->exp_last_committed, req->rq_transno, req->rq_xid); +} +EXPORT_SYMBOL(target_committed_to_req); + +#endif /* HAVE_SERVER_SUPPORT */ /** * Packs current SLV and Limit into \a req. @@ -2188,6 +2421,7 @@ int target_pack_pool_reply(struct ptlrpc_request *req) RETURN(0); } +EXPORT_SYMBOL(target_pack_pool_reply); int target_send_reply_msg(struct ptlrpc_request *req, int rc, int fail_id) { @@ -2197,7 +2431,7 @@ int target_send_reply_msg(struct ptlrpc_request *req, int rc, int fail_id) } if (unlikely(rc)) { - DEBUG_REQ(D_ERROR, req, "processing error (%d)", rc); + DEBUG_REQ(D_NET, req, "processing error (%d)", rc); req->rq_status = rc; return (ptlrpc_send_error(req, 1)); } else { @@ -2209,11 +2443,10 @@ int target_send_reply_msg(struct ptlrpc_request *req, int rc, int fail_id) void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id) { + struct ptlrpc_service_part *svcpt; int netrc; struct ptlrpc_reply_state *rs; - struct obd_device *obd; struct obd_export *exp; - struct ptlrpc_service *svc; ENTRY; if (req->rq_no_reply) { @@ -2221,7 +2454,7 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id) return; } - svc = req->rq_rqbd->rqbd_service; + svcpt = req->rq_rqbd->rqbd_svcpt; rs = req->rq_reply_state; if (rs == NULL || !rs->rs_difficult) { /* no notifiers */ @@ -2233,7 +2466,7 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id) /* must be an export if locks saved */ LASSERT (req->rq_export != NULL); /* req/reply consistent */ - LASSERT (rs->rs_service == svc); + LASSERT(rs->rs_svcpt == svcpt); /* "fresh" reply */ LASSERT (!rs->rs_scheduled); @@ -2245,7 +2478,6 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id) LASSERT (cfs_list_empty(&rs->rs_exp_list)); exp = class_export_get (req->rq_export); - obd = exp->exp_obd; /* disable reply scheduling while I'm setting up */ rs->rs_scheduled = 1; @@ -2253,7 +2485,7 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id) rs->rs_xid = req->rq_xid; rs->rs_transno = req->rq_transno; rs->rs_export = exp; - rs->rs_opc = lustre_msg_get_opc(rs->rs_msg); + rs->rs_opc = lustre_msg_get_opc(req->rq_reqmsg); cfs_spin_lock(&exp->exp_uncommitted_replies_lock); CDEBUG(D_NET, "rs transno = "LPU64", last committed = "LPU64"\n", @@ -2271,9 +2503,9 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id) netrc = target_send_reply_msg (req, rc, fail_id); - cfs_spin_lock(&svc->srv_rs_lock); + cfs_spin_lock(&svcpt->scp_rep_lock); - cfs_atomic_inc(&svc->srv_n_difficult_replies); + cfs_atomic_inc(&svcpt->scp_nreps_difficult); if (netrc != 0) { /* error sending: reply is off the net. Also we need +1 @@ -2293,149 +2525,14 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id) CDEBUG(D_HA, "Schedule reply immediately\n"); ptlrpc_dispatch_difficult_reply(rs); } else { - cfs_list_add (&rs->rs_list, &svc->srv_active_replies); - rs->rs_scheduled = 0; /* allow notifier to schedule */ - } - cfs_spin_unlock(&rs->rs_lock); - cfs_spin_unlock(&svc->srv_rs_lock); - EXIT; -} - -int target_handle_ping(struct ptlrpc_request *req) -{ - obd_ping(req->rq_export); - return req_capsule_server_pack(&req->rq_pill); -} - -void target_committed_to_req(struct ptlrpc_request *req) -{ - struct obd_export *exp = req->rq_export; - - if (!exp->exp_obd->obd_no_transno && req->rq_repmsg != NULL) - lustre_msg_set_last_committed(req->rq_repmsg, - exp->exp_last_committed); - else - DEBUG_REQ(D_IOCTL, req, "not sending last_committed update (%d/" - "%d)", exp->exp_obd->obd_no_transno, - req->rq_repmsg == NULL); - - CDEBUG(D_INFO, "last_committed "LPU64", transno "LPU64", xid "LPU64"\n", - exp->exp_last_committed, req->rq_transno, req->rq_xid); -} -EXPORT_SYMBOL(target_committed_to_req); - -int target_handle_qc_callback(struct ptlrpc_request *req) -{ - struct obd_quotactl *oqctl; - struct client_obd *cli = &req->rq_export->exp_obd->u.cli; - - oqctl = req_capsule_client_get(&req->rq_pill, &RMF_OBD_QUOTACTL); - if (oqctl == NULL) { - CERROR("Can't unpack obd_quotactl\n"); - RETURN(-EPROTO); - } - - cli->cl_qchk_stat = oqctl->qc_stat; - - return 0; + cfs_list_add(&rs->rs_list, &svcpt->scp_rep_active); + rs->rs_scheduled = 0; /* allow notifier to schedule */ + } + cfs_spin_unlock(&rs->rs_lock); + cfs_spin_unlock(&svcpt->scp_rep_lock); + EXIT; } - -#ifdef HAVE_QUOTA_SUPPORT -int target_handle_dqacq_callback(struct ptlrpc_request *req) -{ -#ifdef __KERNEL__ - struct obd_device *obd = req->rq_export->exp_obd; - struct obd_device *master_obd = NULL, *lov_obd = NULL; - struct obd_device_target *obt; - struct lustre_quota_ctxt *qctxt; - struct qunit_data *qdata = NULL; - int rc = 0; - ENTRY; - - if (OBD_FAIL_CHECK(OBD_FAIL_MDS_DROP_QUOTA_REQ)) - RETURN(rc); - - rc = req_capsule_server_pack(&req->rq_pill); - if (rc) { - CERROR("packing reply failed!: rc = %d\n", rc); - RETURN(rc); - } - - LASSERT(req->rq_export); - - qdata = quota_get_qdata(req, QUOTA_REQUEST, QUOTA_EXPORT); - if (IS_ERR(qdata)) { - rc = PTR_ERR(qdata); - CDEBUG(D_ERROR, "Can't unpack qunit_data(rc: %d)\n", rc); - req->rq_status = rc; - GOTO(out, rc); - } - - /* we use the observer */ - if (obd_pin_observer(obd, &lov_obd) || - obd_pin_observer(lov_obd, &master_obd)) { - CERROR("Can't find the observer, it is recovering\n"); - req->rq_status = -EAGAIN; - GOTO(out, rc); - } - - obt = &master_obd->u.obt; - qctxt = &obt->obt_qctxt; - - if (!qctxt->lqc_setup || !qctxt->lqc_valid) { - /* quota_type has not been processed yet, return EAGAIN - * until we know whether or not quotas are supposed to - * be enabled */ - CDEBUG(D_QUOTA, "quota_type not processed yet, return " - "-EAGAIN\n"); - req->rq_status = -EAGAIN; - GOTO(out, rc); - } - - cfs_down_read(&obt->obt_rwsem); - if (qctxt->lqc_lqs_hash == NULL) { - cfs_up_read(&obt->obt_rwsem); - /* quota_type has not been processed yet, return EAGAIN - * until we know whether or not quotas are supposed to - * be enabled */ - CDEBUG(D_QUOTA, "quota_ctxt is not ready yet, return " - "-EAGAIN\n"); - req->rq_status = -EAGAIN; - GOTO(out, rc); - } - - LASSERT(qctxt->lqc_handler); - rc = qctxt->lqc_handler(master_obd, qdata, - lustre_msg_get_opc(req->rq_reqmsg)); - cfs_up_read(&obt->obt_rwsem); - if (rc && rc != -EDQUOT) - CDEBUG(rc == -EBUSY ? D_QUOTA : D_ERROR, - "dqacq/dqrel failed! (rc:%d)\n", rc); - req->rq_status = rc; - - rc = quota_copy_qdata(req, qdata, QUOTA_REPLY, QUOTA_EXPORT); - if (rc < 0) { - CERROR("Can't pack qunit_data(rc: %d)\n", rc); - GOTO(out, rc); - } - - /* Block the quota req. b=14840 */ - OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_BLOCK_QUOTA_REQ, obd_timeout); - EXIT; - -out: - if (master_obd) - obd_unpin_observer(lov_obd); - if (lov_obd) - obd_unpin_observer(obd); - - rc = ptlrpc_reply(req); - return rc; -#else - return 0; -#endif /* !__KERNEL__ */ -} -#endif /* HAVE_QUOTA_SUPPORT */ +EXPORT_SYMBOL(target_send_reply); ldlm_mode_t lck_compat_array[] = { [LCK_EX] LCK_COMPAT_EX, @@ -2536,12 +2633,13 @@ void ldlm_dump_export_locks(struct obd_export *exp) CERROR("dumping locks for export %p," "ignore if the unmount doesn't hang\n", exp); cfs_list_for_each_entry(lock, &exp->exp_locks_list, l_exp_refs_link) - ldlm_lock_dump(D_ERROR, lock, 0); + LDLM_ERROR(lock, "lock:"); } cfs_spin_unlock(&exp->exp_locks_list_guard); } #endif +#ifdef HAVE_SERVER_SUPPORT static int target_bulk_timeout(void *data) { ENTRY; @@ -2645,3 +2743,5 @@ int target_bulk_io(struct obd_export *exp, struct ptlrpc_bulk_desc *desc, RETURN(rc); } EXPORT_SYMBOL(target_bulk_io); + +#endif /* HAVE_SERVER_SUPPORT */