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

staging/lustre/obdclass: Fix style vs open parenthesis alignment

This mostly fixes checkpatch complaints about
"Alignment should match open parenthesis"
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79910d7d
...@@ -385,8 +385,7 @@ static int cl_lockset_lock_one(const struct lu_env *env, ...@@ -385,8 +385,7 @@ static int cl_lockset_lock_one(const struct lu_env *env,
if (!(link->cill_descr.cld_enq_flags & CEF_ASYNC)) { if (!(link->cill_descr.cld_enq_flags & CEF_ASYNC)) {
result = cl_wait(env, lock); result = cl_wait(env, lock);
if (result == 0) if (result == 0)
list_move(&link->cill_linkage, list_move(&link->cill_linkage, &set->cls_done);
&set->cls_done);
} else } else
result = 0; result = 0;
} else } else
...@@ -434,8 +433,7 @@ static int cl_lockset_lock(const struct lu_env *env, struct cl_io *io, ...@@ -434,8 +433,7 @@ static int cl_lockset_lock(const struct lu_env *env, struct cl_io *io,
lock = link->cill_lock; lock = link->cill_lock;
result = cl_wait(env, lock); result = cl_wait(env, lock);
if (result == 0) if (result == 0)
list_move(&link->cill_linkage, list_move(&link->cill_linkage, &set->cls_done);
&set->cls_done);
else else
break; break;
} }
......
...@@ -382,8 +382,7 @@ static struct cl_lock *cl_lock_alloc(const struct lu_env *env, ...@@ -382,8 +382,7 @@ static struct cl_lock *cl_lock_alloc(const struct lu_env *env,
CS_LOCK_INC(obj, total); CS_LOCK_INC(obj, total);
CS_LOCK_INC(obj, create); CS_LOCK_INC(obj, create);
cl_lock_lockdep_init(lock); cl_lock_lockdep_init(lock);
list_for_each_entry(obj, &head->loh_layers, list_for_each_entry(obj, &head->loh_layers, co_lu.lo_linkage) {
co_lu.lo_linkage) {
int err; int err;
err = obj->co_ops->coo_lock_init(env, obj, lock, io); err = obj->co_ops->coo_lock_init(env, obj, lock, io);
...@@ -1658,7 +1657,7 @@ void cl_lock_disclosure(const struct lu_env *env, ...@@ -1658,7 +1657,7 @@ void cl_lock_disclosure(const struct lu_env *env,
cl_lock_trace(D_DLMTRACE, env, "disclosure lock", closure->clc_origin); cl_lock_trace(D_DLMTRACE, env, "disclosure lock", closure->clc_origin);
list_for_each_entry_safe(scan, temp, &closure->clc_list, list_for_each_entry_safe(scan, temp, &closure->clc_list,
cll_inclosure){ cll_inclosure) {
list_del_init(&scan->cll_inclosure); list_del_init(&scan->cll_inclosure);
cl_lock_mutex_put(env, scan); cl_lock_mutex_put(env, scan);
lu_ref_del(&scan->cll_reference, "closure", closure); lu_ref_del(&scan->cll_reference, "closure", closure);
......
...@@ -247,8 +247,7 @@ int cl_object_attr_set(const struct lu_env *env, struct cl_object *obj, ...@@ -247,8 +247,7 @@ int cl_object_attr_set(const struct lu_env *env, struct cl_object *obj,
top = obj->co_lu.lo_header; top = obj->co_lu.lo_header;
result = 0; result = 0;
list_for_each_entry_reverse(obj, &top->loh_layers, list_for_each_entry_reverse(obj, &top->loh_layers, co_lu.lo_linkage) {
co_lu.lo_linkage) {
if (obj->co_ops->coo_attr_set) { if (obj->co_ops->coo_attr_set) {
result = obj->co_ops->coo_attr_set(env, obj, attr, v); result = obj->co_ops->coo_attr_set(env, obj, attr, v);
if (result != 0) { if (result != 0) {
...@@ -278,8 +277,7 @@ int cl_object_glimpse(const struct lu_env *env, struct cl_object *obj, ...@@ -278,8 +277,7 @@ int cl_object_glimpse(const struct lu_env *env, struct cl_object *obj,
top = obj->co_lu.lo_header; top = obj->co_lu.lo_header;
result = 0; result = 0;
list_for_each_entry_reverse(obj, &top->loh_layers, list_for_each_entry_reverse(obj, &top->loh_layers, co_lu.lo_linkage) {
co_lu.lo_linkage) {
if (obj->co_ops->coo_glimpse) { if (obj->co_ops->coo_glimpse) {
result = obj->co_ops->coo_glimpse(env, obj, lvb); result = obj->co_ops->coo_glimpse(env, obj, lvb);
if (result != 0) if (result != 0)
......
...@@ -277,7 +277,8 @@ static inline void cl_page_state_set_trust(struct cl_page *page, ...@@ -277,7 +277,8 @@ static inline void cl_page_state_set_trust(struct cl_page *page,
} }
static struct cl_page *cl_page_alloc(const struct lu_env *env, static struct cl_page *cl_page_alloc(const struct lu_env *env,
struct cl_object *o, pgoff_t ind, struct page *vmpage, struct cl_object *o, pgoff_t ind,
struct page *vmpage,
enum cl_page_type type) enum cl_page_type type)
{ {
struct cl_page *page; struct cl_page *page;
...@@ -303,8 +304,7 @@ static struct cl_page *cl_page_alloc(const struct lu_env *env, ...@@ -303,8 +304,7 @@ static struct cl_page *cl_page_alloc(const struct lu_env *env,
mutex_init(&page->cp_mutex); mutex_init(&page->cp_mutex);
lu_ref_init(&page->cp_reference); lu_ref_init(&page->cp_reference);
head = o->co_lu.lo_header; head = o->co_lu.lo_header;
list_for_each_entry(o, &head->loh_layers, list_for_each_entry(o, &head->loh_layers, co_lu.lo_linkage) {
co_lu.lo_linkage) {
if (o->co_ops->coo_page_init) { if (o->co_ops->coo_page_init) {
result = o->co_ops->coo_page_init(env, o, result = o->co_ops->coo_page_init(env, o,
page, vmpage); page, vmpage);
......
...@@ -199,8 +199,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg) ...@@ -199,8 +199,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
err = -ENOMEM; err = -ENOMEM;
goto out; goto out;
} }
err = copy_from_user(lcfg, data->ioc_pbuf1, err = copy_from_user(lcfg, data->ioc_pbuf1, data->ioc_plen1);
data->ioc_plen1);
if (!err) if (!err)
err = lustre_cfg_sanity_check(lcfg, data->ioc_plen1); err = lustre_cfg_sanity_check(lcfg, data->ioc_plen1);
if (!err) if (!err)
......
...@@ -647,7 +647,8 @@ int lprocfs_rd_import(struct seq_file *m, void *data) ...@@ -647,7 +647,8 @@ int lprocfs_rd_import(struct seq_file *m, void *data)
obd2cli_tgt(obd), obd2cli_tgt(obd),
ptlrpc_import_state_name(imp->imp_state), ptlrpc_import_state_name(imp->imp_state),
imp->imp_connect_data.ocd_instance); imp->imp_connect_data.ocd_instance);
obd_connect_seq_flags2str(m, imp->imp_connect_data.ocd_connect_flags, ", "); obd_connect_seq_flags2str(m, imp->imp_connect_data.ocd_connect_flags,
", ");
seq_printf(m, seq_printf(m,
" ]\n" " ]\n"
" import_flags: [ "); " import_flags: [ ");
...@@ -1427,10 +1428,8 @@ char *lprocfs_find_named_value(const char *buffer, const char *name, ...@@ -1427,10 +1428,8 @@ char *lprocfs_find_named_value(const char *buffer, const char *name,
} }
EXPORT_SYMBOL(lprocfs_find_named_value); EXPORT_SYMBOL(lprocfs_find_named_value);
int ldebugfs_seq_create(struct dentry *parent, int ldebugfs_seq_create(struct dentry *parent, const char *name,
const char *name, umode_t mode, const struct file_operations *seq_fops,
umode_t mode,
const struct file_operations *seq_fops,
void *data) void *data)
{ {
struct dentry *entry; struct dentry *entry;
......
...@@ -1473,8 +1473,7 @@ void lu_context_key_quiesce(struct lu_context_key *key) ...@@ -1473,8 +1473,7 @@ void lu_context_key_quiesce(struct lu_context_key *key)
* XXX memory barrier has to go here. * XXX memory barrier has to go here.
*/ */
spin_lock(&lu_keys_guard); spin_lock(&lu_keys_guard);
list_for_each_entry(ctx, &lu_context_remembered, list_for_each_entry(ctx, &lu_context_remembered, lc_remember)
lc_remember)
key_fini(ctx, key->lct_index); key_fini(ctx, key->lct_index);
spin_unlock(&lu_keys_guard); spin_unlock(&lu_keys_guard);
++key_set_version; ++key_set_version;
......
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