Commit ae0b4833 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman

staging/lustre/libcfs: Cleanup: parenthesis alignment adjustments

Adjust alignment of argments that were pushed to next lines
to conform to kernel code style.
Found with checkpatch.
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f2f80c1
...@@ -448,8 +448,7 @@ void libcfs_debug_dumplog_internal(void *arg) ...@@ -448,8 +448,7 @@ void libcfs_debug_dumplog_internal(void *arg)
snprintf(debug_file_name, sizeof(debug_file_name) - 1, snprintf(debug_file_name, sizeof(debug_file_name) - 1,
"%s.%lld.%ld", libcfs_debug_file_path_arr, "%s.%lld.%ld", libcfs_debug_file_path_arr,
(s64)ktime_get_real_seconds(), (long_ptr_t)arg); (s64)ktime_get_real_seconds(), (long_ptr_t)arg);
pr_alert("LustreError: dumping log to %s\n", pr_alert("LustreError: dumping log to %s\n", debug_file_name);
debug_file_name);
cfs_tracefile_dump_all_pages(debug_file_name); cfs_tracefile_dump_all_pages(debug_file_name);
libcfs_run_debug_log_upcall(debug_file_name); libcfs_run_debug_log_upcall(debug_file_name);
} }
......
...@@ -346,8 +346,7 @@ cfs_range_expr_print(char *buffer, int count, struct cfs_range_expr *expr, ...@@ -346,8 +346,7 @@ cfs_range_expr_print(char *buffer, int count, struct cfs_range_expr *expr,
s, expr->re_lo, expr->re_hi, e); s, expr->re_lo, expr->re_hi, e);
else else
i = scnprintf(buffer, count, "%s%u-%u/%u%s", i = scnprintf(buffer, count, "%s%u-%u/%u%s",
s, expr->re_lo, expr->re_hi, s, expr->re_lo, expr->re_hi, expr->re_stride, e);
expr->re_stride, e);
return i; return i;
} }
...@@ -520,15 +519,12 @@ cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max, ...@@ -520,15 +519,12 @@ cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max,
if (rc != 0) if (rc != 0)
break; break;
list_add_tail(&expr->re_link, list_add_tail(&expr->re_link, &expr_list->el_exprs);
&expr_list->el_exprs);
} }
} else { } else {
rc = cfs_range_expr_parse(&src, min, max, 0, &expr); rc = cfs_range_expr_parse(&src, min, max, 0, &expr);
if (rc == 0) { if (rc == 0)
list_add_tail(&expr->re_link, list_add_tail(&expr->re_link, &expr_list->el_exprs);
&expr_list->el_exprs);
}
} }
if (rc != 0) if (rc != 0)
...@@ -554,8 +550,7 @@ cfs_expr_list_free_list(struct list_head *list) ...@@ -554,8 +550,7 @@ cfs_expr_list_free_list(struct list_head *list)
struct cfs_expr_list *el; struct cfs_expr_list *el;
while (!list_empty(list)) { while (!list_empty(list)) {
el = list_entry(list->next, el = list_entry(list->next, struct cfs_expr_list, el_link);
struct cfs_expr_list, el_link);
list_del(&el->el_link); list_del(&el->el_link);
cfs_expr_list_free(el); cfs_expr_list_free(el);
} }
......
...@@ -193,8 +193,8 @@ struct cfs_psdev_ops libcfs_psdev_ops = { ...@@ -193,8 +193,8 @@ struct cfs_psdev_ops libcfs_psdev_ops = {
static int proc_call_handler(void *data, int write, loff_t *ppos, static int proc_call_handler(void *data, int write, loff_t *ppos,
void __user *buffer, size_t *lenp, void __user *buffer, size_t *lenp,
int (*handler)(void *data, int write, int (*handler)(void *data, int write, loff_t pos,
loff_t pos, void __user *buffer, int len)) void __user *buffer, int len))
{ {
int rc = handler(data, write, *ppos, buffer, *lenp); int rc = handler(data, write, *ppos, buffer, *lenp);
......
...@@ -503,8 +503,7 @@ panic_collect_pages(struct page_collection *pc) ...@@ -503,8 +503,7 @@ panic_collect_pages(struct page_collection *pc)
tcd->tcd_cur_pages = 0; tcd->tcd_cur_pages = 0;
if (pc->pc_want_daemon_pages) { if (pc->pc_want_daemon_pages) {
list_splice_init(&tcd->tcd_daemon_pages, list_splice_init(&tcd->tcd_daemon_pages, &pc->pc_pages);
&pc->pc_pages);
tcd->tcd_cur_daemon_pages = 0; tcd->tcd_cur_daemon_pages = 0;
} }
} }
...@@ -980,8 +979,7 @@ static int tracefiled(void *arg) ...@@ -980,8 +979,7 @@ static int tracefiled(void *arg)
MMSPACE_OPEN; MMSPACE_OPEN;
list_for_each_entry_safe(tage, tmp, &pc.pc_pages, list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) {
linkage) {
static loff_t f_pos; static loff_t f_pos;
__LASSERT_TAGE_INVARIANT(tage); __LASSERT_TAGE_INVARIANT(tage);
...@@ -1012,8 +1010,7 @@ static int tracefiled(void *arg) ...@@ -1012,8 +1010,7 @@ static int tracefiled(void *arg)
int i; int i;
printk(KERN_ALERT "Lustre: trace pages aren't empty\n"); printk(KERN_ALERT "Lustre: trace pages aren't empty\n");
pr_err("total cpus(%d): ", pr_err("total cpus(%d): ", num_possible_cpus());
num_possible_cpus());
for (i = 0; i < num_possible_cpus(); i++) for (i = 0; i < num_possible_cpus(); i++)
if (cpu_online(i)) if (cpu_online(i))
pr_cont("%d(on) ", i); pr_cont("%d(on) ", i);
......
...@@ -234,8 +234,8 @@ cfs_wi_scheduler (void *arg) ...@@ -234,8 +234,8 @@ cfs_wi_scheduler (void *arg)
while (!list_empty(&sched->ws_runq) && while (!list_empty(&sched->ws_runq) &&
nloops < CFS_WI_RESCHED) { nloops < CFS_WI_RESCHED) {
wi = list_entry(sched->ws_runq.next, wi = list_entry(sched->ws_runq.next, cfs_workitem_t,
cfs_workitem_t, wi_list); wi_list);
LASSERT(wi->wi_scheduled && !wi->wi_running); LASSERT(wi->wi_scheduled && !wi->wi_running);
list_del_init(&wi->wi_list); list_del_init(&wi->wi_list);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment