From 4720518e7a9665120c6673b59ba2c1d20be320a3 Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Sun, 26 Aug 2018 03:30:07 +0530 Subject: [PATCH 1/1] LU-6142 obdclass: Fix style issues for lu_ref.c This patch fixes issues reported by checkpatch for file lustre/obdclass/lu_ref.c Change-Id: I8733fcac454685704b327219ba4afb096d3943c3 Test-Parameters: trivial Signed-off-by: Arshad Hussain Reviewed-on: https://review.whamcloud.com/33081 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Simmons --- lustre/obdclass/lu_ref.c | 170 ++++++++++++++++++++++++----------------------- 1 file changed, 86 insertions(+), 84 deletions(-) diff --git a/lustre/obdclass/lu_ref.c b/lustre/obdclass/lu_ref.c index e847401..e0a7579 100644 --- a/lustre/obdclass/lu_ref.c +++ b/lustre/obdclass/lu_ref.c @@ -65,14 +65,14 @@ static struct kmem_cache *lu_ref_link_kmem; static struct lu_kmem_descr lu_ref_caches[] = { - { - .ckd_cache = &lu_ref_link_kmem, - .ckd_name = "lu_ref_link_kmem", - .ckd_size = sizeof (struct lu_ref_link) - }, - { - .ckd_cache = NULL - } + { + .ckd_cache = &lu_ref_link_kmem, + .ckd_name = "lu_ref_link_kmem", + .ckd_size = sizeof(struct lu_ref_link) + }, + { + .ckd_cache = NULL + } }; /** @@ -90,18 +90,18 @@ static struct lu_ref lu_ref_marker = { void lu_ref_print(const struct lu_ref *ref) { - struct lu_ref_link *link; + struct lu_ref_link *link; - CERROR("lu_ref: %p %d %d %s:%d\n", - ref, ref->lf_refs, ref->lf_failed, ref->lf_func, ref->lf_line); + CERROR("lu_ref: %p %d %d %s:%d\n", + ref, ref->lf_refs, ref->lf_failed, ref->lf_func, ref->lf_line); list_for_each_entry(link, &ref->lf_list, ll_linkage) { - CERROR(" link: %s %p\n", link->ll_scope, link->ll_source); - } + CERROR(" link: %s %p\n", link->ll_scope, link->ll_source); + } } static int lu_ref_is_marker(const struct lu_ref *ref) { - return (ref == &lu_ref_marker); + return ref == &lu_ref_marker; } void lu_ref_print_all(void) @@ -146,19 +146,19 @@ void lu_ref_fini(struct lu_ref *ref) EXPORT_SYMBOL(lu_ref_fini); static struct lu_ref_link *lu_ref_add_context(struct lu_ref *ref, - int flags, - const char *scope, - const void *source) + int flags, + const char *scope, + const void *source) { - struct lu_ref_link *link; - - link = NULL; - if (lu_ref_link_kmem != NULL) { - OBD_SLAB_ALLOC_PTR_GFP(link, lu_ref_link_kmem, flags); - if (link != NULL) { - link->ll_ref = ref; - link->ll_scope = scope; - link->ll_source = source; + struct lu_ref_link *link; + + link = NULL; + if (lu_ref_link_kmem != NULL) { + OBD_SLAB_ALLOC_PTR_GFP(link, lu_ref_link_kmem, flags); + if (link != NULL) { + link->ll_ref = ref; + link->ll_scope = scope; + link->ll_source = source; spin_lock(&ref->lf_guard); list_add_tail(&link->ll_linkage, &ref->lf_list); ref->lf_refs++; @@ -207,9 +207,10 @@ void lu_ref_add_atomic(struct lu_ref *ref, const char *scope, EXPORT_SYMBOL(lu_ref_add_atomic); static inline int lu_ref_link_eq(const struct lu_ref_link *link, - const char *scope, const void *source) + const char *scope, + const void *source) { - return link->ll_source == source && !strcmp(link->ll_scope, scope); + return link->ll_source == source && !strcmp(link->ll_scope, scope); } /** @@ -223,22 +224,22 @@ static unsigned lu_ref_chain_max_length = 127; static struct lu_ref_link *lu_ref_find(struct lu_ref *ref, const char *scope, const void *source) { - struct lu_ref_link *link; - unsigned iterations; + struct lu_ref_link *link; + unsigned int iterations; - iterations = 0; + iterations = 0; list_for_each_entry(link, &ref->lf_list, ll_linkage) { - ++iterations; - if (lu_ref_link_eq(link, scope, source)) { - if (iterations > lu_ref_chain_max_length) { - CWARN("Long lu_ref chain %d \"%s\":%p\n", - iterations, scope, source); - lu_ref_chain_max_length = iterations * 3 / 2; - } - return link; - } - } - return NULL; + ++iterations; + if (lu_ref_link_eq(link, scope, source)) { + if (iterations > lu_ref_chain_max_length) { + CWARN("Long lu_ref chain %d \"%s\":%p\n", + iterations, scope, source); + lu_ref_chain_max_length = iterations * 3 / 2; + } + return link; + } + } + return NULL; } void lu_ref_del(struct lu_ref *ref, const char *scope, const void *source) @@ -302,10 +303,10 @@ static void *lu_ref_seq_start(struct seq_file *seq, loff_t *pos) static void *lu_ref_seq_next(struct seq_file *seq, void *p, loff_t *pos) { - struct lu_ref *ref = p; - struct lu_ref *next; + struct lu_ref *ref = p; + struct lu_ref *next; - LASSERT(seq->private == p); + LASSERT(seq->private == p); LASSERT(!list_empty(&ref->lf_linkage)); spin_lock(&lu_ref_refs_guard); @@ -322,7 +323,7 @@ static void *lu_ref_seq_next(struct seq_file *seq, void *p, loff_t *pos) static void lu_ref_seq_stop(struct seq_file *seq, void *p) { - /* Nothing to do */ + /* Nothing to do */ } @@ -340,19 +341,19 @@ static int lu_ref_seq_show(struct seq_file *seq, void *p) /* print the entry */ spin_lock(&next->lf_guard); - seq_printf(seq, "lu_ref: %p %d %d %s:%d\n", - next, next->lf_refs, next->lf_failed, - next->lf_func, next->lf_line); - if (next->lf_refs > 64) { - seq_printf(seq, " too many references, skip\n"); - } else { - struct lu_ref_link *link; - int i = 0; + seq_printf(seq, "lu_ref: %p %d %d %s:%d\n", + next, next->lf_refs, next->lf_failed, + next->lf_func, next->lf_line); + if (next->lf_refs > 64) { + seq_puts(seq, " too many references, skip\n"); + } else { + struct lu_ref_link *link; + int i = 0; list_for_each_entry(link, &next->lf_list, ll_linkage) - seq_printf(seq, " #%d link: %s %p\n", - i++, link->ll_scope, link->ll_source); - } + seq_printf(seq, " #%d link: %s %p\n", + i++, link->ll_scope, link->ll_source); + } spin_unlock(&next->lf_guard); spin_unlock(&lu_ref_refs_guard); @@ -360,10 +361,10 @@ static int lu_ref_seq_show(struct seq_file *seq, void *p) } static struct seq_operations lu_ref_seq_ops = { - .start = lu_ref_seq_start, - .stop = lu_ref_seq_stop, - .next = lu_ref_seq_next, - .show = lu_ref_seq_show + .start = lu_ref_seq_start, + .stop = lu_ref_seq_stop, + .next = lu_ref_seq_next, + .show = lu_ref_seq_show }; static int lu_ref_seq_open(struct inode *inode, struct file *file) @@ -380,15 +381,16 @@ static int lu_ref_seq_open(struct inode *inode, struct file *file) list_add(&marker->lf_linkage, &lu_ref_refs); spin_unlock(&lu_ref_refs_guard); - if (result == 0) { - struct seq_file *f = file->private_data; - f->private = marker; - } else { - seq_release(inode, file); - } - } + if (result == 0) { + struct seq_file *f = file->private_data; + + f->private = marker; + } else { + seq_release(inode, file); + } + } - return result; + return result; } static int lu_ref_seq_release(struct inode *inode, struct file *file) @@ -403,11 +405,11 @@ static int lu_ref_seq_release(struct inode *inode, struct file *file) } static struct file_operations lu_ref_dump_fops = { - .owner = THIS_MODULE, - .open = lu_ref_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = lu_ref_seq_release + .owner = THIS_MODULE, + .open = lu_ref_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = lu_ref_seq_release }; #endif /* CONFIG_PROC_FS */ @@ -419,26 +421,26 @@ int lu_ref_global_init(void) CDEBUG(D_CONSOLE, "lu_ref tracking is enabled. Performance isn't.\n"); - result = lu_kmem_init(lu_ref_caches); + result = lu_kmem_init(lu_ref_caches); #ifdef CONFIG_PROC_FS - if (result == 0) { - result = lprocfs_seq_create(proc_lustre_root, "lu_refs", - 0444, &lu_ref_dump_fops, NULL); - if (result) - lu_kmem_fini(lu_ref_caches); - } + if (result == 0) { + result = lprocfs_seq_create(proc_lustre_root, "lu_refs", + 0444, &lu_ref_dump_fops, NULL); + if (result) + lu_kmem_fini(lu_ref_caches); + } #endif /* CONFIG_PROC_FS */ - return result; + return result; } void lu_ref_global_fini(void) { #ifdef CONFIG_PROC_FS - lprocfs_remove_proc_entry("lu_refs", proc_lustre_root); + lprocfs_remove_proc_entry("lu_refs", proc_lustre_root); #endif /* CONFIG_PROC_FS */ - lu_kmem_fini(lu_ref_caches); + lu_kmem_fini(lu_ref_caches); } #endif /* USE_LU_REF */ -- 1.8.3.1