From 2730005e1478db28c0cb50a12e5d40c9a8b81a47 Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Fri, 2 Nov 2018 14:27:15 +0530 Subject: [PATCH] LU-6142 fld: Fix style issues for fld_request.c This patch fixes issues reported by checkpatch for file lustre/fld/fld_request.c Change-Id: I45fc242eccf17c33b2fa938e401f1a581b2b53ac Test-Parameters: trivial Signed-off-by: Arshad Hussain Reviewed-on: https://review.whamcloud.com/33602 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Ben Evans Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin --- lustre/fld/fld_request.c | 294 +++++++++++++++++++++++++---------------------- 1 file changed, 155 insertions(+), 139 deletions(-) diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c index d6f9b1c..123bc97 100644 --- a/lustre/fld/fld_request.c +++ b/lustre/fld/fld_request.c @@ -60,15 +60,18 @@ static int fld_rrb_hash(struct lu_client_fld *fld, u64 seq) static struct lu_fld_target * fld_rrb_scan(struct lu_client_fld *fld, u64 seq) { - struct lu_fld_target *target; - int hash; - ENTRY; + struct lu_fld_target *target; + int hash; + + ENTRY; - /* Because almost all of special sequence located in MDT0, + /* + * Because almost all of special sequence located in MDT0, * it should go to index 0 directly, instead of calculating * hash again, and also if other MDTs is not being connected, * the fld lookup requests(for seq on MDT0) should not be - * blocked because of other MDTs */ + * blocked because of other MDTs + */ if (fid_seq_is_norm(seq)) hash = fld_rrb_hash(fld, seq); else @@ -76,57 +79,59 @@ fld_rrb_scan(struct lu_client_fld *fld, u64 seq) again: list_for_each_entry(target, &fld->lcf_targets, ft_chain) { - if (target->ft_idx == hash) - RETURN(target); - } + if (target->ft_idx == hash) + RETURN(target); + } if (hash != 0) { - /* It is possible the remote target(MDT) are not connected to + /* + * It is possible the remote target(MDT) are not connected to * with client yet, so we will refer this to MDT0, which should - * be connected during mount */ + * be connected during mount + */ hash = 0; goto again; } - CERROR("%s: Can't find target by hash %d (seq %#llx). " - "Targets (%d):\n", fld->lcf_name, hash, seq, - fld->lcf_count); + CERROR("%s: Can't find target by hash %d (seq %#llx). Targets (%d):\n", + fld->lcf_name, hash, seq, fld->lcf_count); list_for_each_entry(target, &fld->lcf_targets, ft_chain) { - const char *srv_name = target->ft_srv != NULL ? - target->ft_srv->lsf_name : ""; - const char *exp_name = target->ft_exp != NULL ? - (char *)target->ft_exp->exp_obd->obd_uuid.uuid : - ""; + const char *srv_name = target->ft_srv != NULL ? + target->ft_srv->lsf_name : ""; + const char *exp_name = target->ft_exp != NULL ? + (char *)target->ft_exp->exp_obd->obd_uuid.uuid : + ""; CERROR(" exp: 0x%p (%s), srv: 0x%p (%s), idx: %llu\n", - target->ft_exp, exp_name, target->ft_srv, - srv_name, target->ft_idx); - } - - /* - * If target is not found, there is logical error anyway, so here is - * LBUG() to catch this situation. - */ - LBUG(); - RETURN(NULL); + target->ft_exp, exp_name, target->ft_srv, + srv_name, target->ft_idx); + } + + /* + * If target is not found, there is logical error anyway, so here is + * LBUG() to catch this situation. + */ + LBUG(); + RETURN(NULL); } struct lu_fld_hash fld_hash[] = { - { - .fh_name = "RRB", - .fh_hash_func = fld_rrb_hash, - .fh_scan_func = fld_rrb_scan - }, - { + { + .fh_name = "RRB", + .fh_hash_func = fld_rrb_hash, + .fh_scan_func = fld_rrb_scan + }, + { NULL, - } + } }; static struct lu_fld_target * fld_client_get_target(struct lu_client_fld *fld, u64 seq) { struct lu_fld_target *target; + ENTRY; LASSERT(fld->lcf_hash != NULL); @@ -135,13 +140,12 @@ fld_client_get_target(struct lu_client_fld *fld, u64 seq) target = fld->lcf_hash->fh_scan_func(fld, seq); spin_unlock(&fld->lcf_lock); - if (target != NULL) { - CDEBUG(D_INFO, "%s: Found target (idx %llu" - ") by seq %#llx\n", fld->lcf_name, - target->ft_idx, seq); - } + if (target) { + CDEBUG(D_INFO, "%s: Found target (idx %llu) by seq %#llx\n", + fld->lcf_name, target->ft_idx, seq); + } - RETURN(target); + RETURN(target); } /* @@ -149,44 +153,45 @@ fld_client_get_target(struct lu_client_fld *fld, u64 seq) * of FLD module. */ int fld_client_add_target(struct lu_client_fld *fld, - struct lu_fld_target *tar) + struct lu_fld_target *tar) { const char *name; - struct lu_fld_target *target, *tmp; - ENTRY; + struct lu_fld_target *target, *tmp; + + ENTRY; - LASSERT(tar != NULL); + LASSERT(tar != NULL); name = fld_target_name(tar); - LASSERT(name != NULL); - LASSERT(tar->ft_srv != NULL || tar->ft_exp != NULL); + LASSERT(name != NULL); + LASSERT(tar->ft_srv != NULL || tar->ft_exp != NULL); CDEBUG(D_INFO, "%s: Adding target %s (idx %llu)\n", fld->lcf_name, name, tar->ft_idx); - OBD_ALLOC_PTR(target); - if (target == NULL) - RETURN(-ENOMEM); + OBD_ALLOC_PTR(target); + if (!target) + RETURN(-ENOMEM); spin_lock(&fld->lcf_lock); list_for_each_entry(tmp, &fld->lcf_targets, ft_chain) { if (tmp->ft_idx == tar->ft_idx) { spin_unlock(&fld->lcf_lock); - OBD_FREE_PTR(target); + OBD_FREE_PTR(target); CERROR("Target %s exists in FLD and known as %s:#%llu\n", - name, fld_target_name(tmp), tmp->ft_idx); - RETURN(-EEXIST); - } - } + name, fld_target_name(tmp), tmp->ft_idx); + RETURN(-EEXIST); + } + } - target->ft_exp = tar->ft_exp; - if (target->ft_exp != NULL) - class_export_get(target->ft_exp); - target->ft_srv = tar->ft_srv; - target->ft_idx = tar->ft_idx; + target->ft_exp = tar->ft_exp; + if (target->ft_exp) + class_export_get(target->ft_exp); + target->ft_srv = tar->ft_srv; + target->ft_idx = tar->ft_idx; list_add_tail(&target->ft_chain, &fld->lcf_targets); - fld->lcf_count++; + fld->lcf_count++; spin_unlock(&fld->lcf_lock); RETURN(0); @@ -194,9 +199,10 @@ int fld_client_add_target(struct lu_client_fld *fld, EXPORT_SYMBOL(fld_client_add_target); /* Remove export from FLD */ -int fld_client_del_target(struct lu_client_fld *fld, __u64 idx) +int fld_client_del_target(struct lu_client_fld *fld, u64 idx) { struct lu_fld_target *target, *tmp; + ENTRY; spin_lock(&fld->lcf_lock); @@ -206,13 +212,13 @@ int fld_client_del_target(struct lu_client_fld *fld, __u64 idx) list_del(&target->ft_chain); spin_unlock(&fld->lcf_lock); - if (target->ft_exp != NULL) - class_export_put(target->ft_exp); + if (target->ft_exp) + class_export_put(target->ft_exp); - OBD_FREE_PTR(target); - RETURN(0); - } - } + OBD_FREE_PTR(target); + RETURN(0); + } + } spin_unlock(&fld->lcf_lock); RETURN(-ENOENT); } @@ -248,11 +254,11 @@ EXPORT_SYMBOL(fld_client_debugfs_fini); static inline int hash_is_sane(int hash) { - return (hash >= 0 && hash < ARRAY_SIZE(fld_hash)); + return (hash >= 0 && hash < ARRAY_SIZE(fld_hash)); } int fld_client_init(struct lu_client_fld *fld, - const char *prefix, int hash) + const char *prefix, int hash) { int cache_size, cache_threshold; int rc; @@ -261,79 +267,81 @@ int fld_client_init(struct lu_client_fld *fld, snprintf(fld->lcf_name, sizeof(fld->lcf_name), "cli-%s", prefix); - if (!hash_is_sane(hash)) { - CERROR("%s: Wrong hash function %#x\n", - fld->lcf_name, hash); - RETURN(-EINVAL); - } + if (!hash_is_sane(hash)) { + CERROR("%s: Wrong hash function %#x\n", + fld->lcf_name, hash); + RETURN(-EINVAL); + } fld->lcf_count = 0; spin_lock_init(&fld->lcf_lock); fld->lcf_hash = &fld_hash[hash]; INIT_LIST_HEAD(&fld->lcf_targets); - cache_size = FLD_CLIENT_CACHE_SIZE / - sizeof(struct fld_cache_entry); + cache_size = FLD_CLIENT_CACHE_SIZE / + sizeof(struct fld_cache_entry); - cache_threshold = cache_size * - FLD_CLIENT_CACHE_THRESHOLD / 100; + cache_threshold = cache_size * + FLD_CLIENT_CACHE_THRESHOLD / 100; - fld->lcf_cache = fld_cache_init(fld->lcf_name, - cache_size, cache_threshold); - if (IS_ERR(fld->lcf_cache)) { - rc = PTR_ERR(fld->lcf_cache); - fld->lcf_cache = NULL; - GOTO(out, rc); - } + fld->lcf_cache = fld_cache_init(fld->lcf_name, + cache_size, cache_threshold); + if (IS_ERR(fld->lcf_cache)) { + rc = PTR_ERR(fld->lcf_cache); + fld->lcf_cache = NULL; + GOTO(out, rc); + } rc = fld_client_debugfs_init(fld); - if (rc) - GOTO(out, rc); - EXIT; + if (rc) + GOTO(out, rc); + EXIT; out: - if (rc) - fld_client_fini(fld); - else - CDEBUG(D_INFO, "%s: Using \"%s\" hash\n", - fld->lcf_name, fld->lcf_hash->fh_name); - return rc; + if (rc) + fld_client_fini(fld); + else + CDEBUG(D_INFO, "%s: Using \"%s\" hash\n", + fld->lcf_name, fld->lcf_hash->fh_name); + return rc; } EXPORT_SYMBOL(fld_client_init); void fld_client_fini(struct lu_client_fld *fld) { struct lu_fld_target *target, *tmp; + ENTRY; spin_lock(&fld->lcf_lock); list_for_each_entry_safe(target, tmp, &fld->lcf_targets, ft_chain) { - fld->lcf_count--; + fld->lcf_count--; list_del(&target->ft_chain); - if (target->ft_exp != NULL) - class_export_put(target->ft_exp); - OBD_FREE_PTR(target); - } + if (target->ft_exp) + class_export_put(target->ft_exp); + OBD_FREE_PTR(target); + } spin_unlock(&fld->lcf_lock); - if (fld->lcf_cache != NULL) { - if (!IS_ERR(fld->lcf_cache)) - fld_cache_fini(fld->lcf_cache); - fld->lcf_cache = NULL; - } + if (fld->lcf_cache) { + if (!IS_ERR(fld->lcf_cache)) + fld_cache_fini(fld->lcf_cache); + fld->lcf_cache = NULL; + } - EXIT; + EXIT; } EXPORT_SYMBOL(fld_client_fini); int fld_client_rpc(struct obd_export *exp, - struct lu_seq_range *range, __u32 fld_op, + struct lu_seq_range *range, u32 fld_op, struct ptlrpc_request **reqp) { struct ptlrpc_request *req = NULL; - struct lu_seq_range *prange; - __u32 *op; - int rc = 0; - struct obd_import *imp; + struct lu_seq_range *prange; + u32 *op; + int rc = 0; + struct obd_import *imp; + ENTRY; LASSERT(exp != NULL); @@ -344,18 +352,22 @@ again: case FLD_QUERY: req = ptlrpc_request_alloc_pack(imp, &RQF_FLD_QUERY, LUSTRE_MDS_VERSION, FLD_QUERY); - if (req == NULL) + if (!req) RETURN(-ENOMEM); - /* XXX: only needed when talking to old server(< 2.6), it should - * be removed when < 2.6 server is not supported */ + /* + * XXX: only needed when talking to old server(< 2.6), it should + * be removed when < 2.6 server is not supported + */ op = req_capsule_client_get(&req->rq_pill, &RMF_FLD_OPC); *op = FLD_LOOKUP; - /* For MDS_MDS seq lookup, it will always use LWP connection, + /* + * For MDS_MDS seq lookup, it will always use LWP connection, * but LWP will be evicted after restart, so cause the error. * so we will set no_delay for seq lookup request, once the - * request fails because of the eviction. always retry here */ + * request fails because of the eviction. always retry here + */ if (imp->imp_connect_flags_orig & OBD_CONNECT_MDS_MDS) { req->rq_allow_replay = 1; req->rq_no_delay = 1; @@ -364,7 +376,7 @@ again: case FLD_READ: req = ptlrpc_request_alloc_pack(imp, &RQF_FLD_READ, LUSTRE_MDS_VERSION, FLD_READ); - if (req == NULL) + if (!req) RETURN(-ENOMEM); req_capsule_set_size(&req->rq_pill, &RMF_GENERIC_DATA, @@ -381,9 +393,9 @@ again: prange = req_capsule_client_get(&req->rq_pill, &RMF_FLD_MDFLD); *prange = *range; ptlrpc_request_set_replen(req); - req->rq_request_portal = FLD_REQUEST_PORTAL; + req->rq_request_portal = FLD_REQUEST_PORTAL; req->rq_reply_portal = MDC_REPLY_PORTAL; - ptlrpc_at_set_req_timeout(req); + ptlrpc_at_set_req_timeout(req); obd_get_request_slot(&exp->exp_obd->u.cli); rc = ptlrpc_queue_wait(req); @@ -400,11 +412,13 @@ again: imp->imp_connect_flags_orig & OBD_CONNECT_MDS_MDS && OCD_HAS_FLAG(&imp->imp_connect_data, LIGHTWEIGHT) && rc != -ENOTSUPP) { - /* Since LWP is not replayable, so it will keep + /* + * Since LWP is not replayable, so it will keep * trying unless umount happens or the remote * target does not support the operation, otherwise * it would cause unecessary failure of the - * application. */ + * application. + */ ptlrpc_req_finished(req); rc = 0; goto again; @@ -415,31 +429,32 @@ again: if (fld_op == FLD_QUERY) { prange = req_capsule_server_get(&req->rq_pill, &RMF_FLD_MDFLD); - if (prange == NULL) + if (!prange) GOTO(out_req, rc = -EFAULT); *range = *prange; } EXIT; out_req: - if (rc != 0 || reqp == NULL) { + if (rc != 0 || !reqp) { ptlrpc_req_finished(req); req = NULL; } - if (reqp != NULL) + if (reqp) *reqp = req; return rc; } int fld_client_lookup(struct lu_client_fld *fld, u64 seq, u32 *mds, - __u32 flags, const struct lu_env *env) + u32 flags, const struct lu_env *env) { struct lu_seq_range res = { 0 }; struct lu_fld_target *target; struct lu_fld_target *origin; int rc; + ENTRY; rc = fld_cache_lookup(fld->lcf_cache, seq, &res); @@ -448,20 +463,19 @@ int fld_client_lookup(struct lu_client_fld *fld, u64 seq, u32 *mds, RETURN(0); } - /* Can not find it in the cache */ - target = fld_client_get_target(fld, seq); - LASSERT(target != NULL); + /* Can not find it in the cache */ + target = fld_client_get_target(fld, seq); + LASSERT(target != NULL); origin = target; again: - CDEBUG(D_INFO, "%s: Lookup fld entry (seq: %#llx) on " - "target %s (idx %llu)\n", fld->lcf_name, seq, - fld_target_name(target), target->ft_idx); + CDEBUG(D_INFO, "%s: Lookup fld entry (seq: %#llx) on target %s (idx %llu)\n", + fld->lcf_name, seq, fld_target_name(target), target->ft_idx); res.lsr_start = seq; fld_range_set_type(&res, flags); #ifdef HAVE_SERVER_SUPPORT - if (target->ft_srv != NULL) { + if (target->ft_srv) { LASSERT(env != NULL); rc = fld_server_lookup(env, target->ft_srv, seq, &res); } else @@ -471,15 +485,17 @@ again: } if (rc == -ESHUTDOWN) { - /* If fld lookup failed because the target has been shutdown, + /* + * If fld lookup failed because the target has been shutdown, * then try next target in the list, until trying all targets - * or fld lookup succeeds */ + * or fld lookup succeeds + */ spin_lock(&fld->lcf_lock); - - /* If the next entry in the list is the head of the list, + /* + * If the next entry in the list is the head of the list, * move to the next entry after the head and retrieve - * the target. Else retreive the next target entry. */ - + * the target. Else retreive the next target entry. + */ if (target->ft_chain.next == &fld->lcf_targets) target = list_entry(target->ft_chain.next->next, struct lu_fld_target, ft_chain); @@ -502,7 +518,7 @@ EXPORT_SYMBOL(fld_client_lookup); void fld_client_flush(struct lu_client_fld *fld) { - fld_cache_flush(fld->lcf_cache); + fld_cache_flush(fld->lcf_cache); } static int __init fld_init(void) -- 1.8.3.1