Commit 9d0b2b7a authored by Greg Donald's avatar Greg Donald Committed by Greg Kroah-Hartman

drivers: staging: lustre: Fix that open brace { should be on the previous line errors

Fix checkpatch.pl that open brace { should be on the previous line errors
Signed-off-by: default avatarGreg Donald <gdonald@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a58a38ac
...@@ -1675,8 +1675,7 @@ ksocknal_send_hello (lnet_ni_t *ni, ksock_conn_t *conn, ...@@ -1675,8 +1675,7 @@ ksocknal_send_hello (lnet_ni_t *ni, ksock_conn_t *conn,
static int static int
ksocknal_invert_type(int type) ksocknal_invert_type(int type)
{ {
switch (type) switch (type) {
{
case SOCKLND_CONN_ANY: case SOCKLND_CONN_ANY:
case SOCKLND_CONN_CONTROL: case SOCKLND_CONN_CONTROL:
return type; return type;
......
...@@ -756,8 +756,7 @@ ksocknal_unpack_msg_v2(ksock_msg_t *msg) ...@@ -756,8 +756,7 @@ ksocknal_unpack_msg_v2(ksock_msg_t *msg)
return; /* Do nothing */ return; /* Do nothing */
} }
ksock_proto_t ksocknal_protocol_v1x = ksock_proto_t ksocknal_protocol_v1x = {
{
.pro_version = KSOCK_PROTO_V1, .pro_version = KSOCK_PROTO_V1,
.pro_send_hello = ksocknal_send_hello_v1, .pro_send_hello = ksocknal_send_hello_v1,
.pro_recv_hello = ksocknal_recv_hello_v1, .pro_recv_hello = ksocknal_recv_hello_v1,
...@@ -770,8 +769,7 @@ ksock_proto_t ksocknal_protocol_v1x = ...@@ -770,8 +769,7 @@ ksock_proto_t ksocknal_protocol_v1x =
.pro_match_tx = ksocknal_match_tx .pro_match_tx = ksocknal_match_tx
}; };
ksock_proto_t ksocknal_protocol_v2x = ksock_proto_t ksocknal_protocol_v2x = {
{
.pro_version = KSOCK_PROTO_V2, .pro_version = KSOCK_PROTO_V2,
.pro_send_hello = ksocknal_send_hello_v2, .pro_send_hello = ksocknal_send_hello_v2,
.pro_recv_hello = ksocknal_recv_hello_v2, .pro_recv_hello = ksocknal_recv_hello_v2,
...@@ -784,8 +782,7 @@ ksock_proto_t ksocknal_protocol_v2x = ...@@ -784,8 +782,7 @@ ksock_proto_t ksocknal_protocol_v2x =
.pro_match_tx = ksocknal_match_tx .pro_match_tx = ksocknal_match_tx
}; };
ksock_proto_t ksocknal_protocol_v3x = ksock_proto_t ksocknal_protocol_v3x = {
{
.pro_version = KSOCK_PROTO_V3, .pro_version = KSOCK_PROTO_V3,
.pro_send_hello = ksocknal_send_hello_v2, .pro_send_hello = ksocknal_send_hello_v2,
.pro_recv_hello = ksocknal_recv_hello_v2, .pro_recv_hello = ksocknal_recv_hello_v2,
......
...@@ -384,8 +384,7 @@ lnet_freelist_init (lnet_freelist_t *fl, int n, int size) ...@@ -384,8 +384,7 @@ lnet_freelist_init (lnet_freelist_t *fl, int n, int size)
fl->fl_nobjs = n; fl->fl_nobjs = n;
fl->fl_objsize = size; fl->fl_objsize = size;
do do {
{
memset (space, 0, size); memset (space, 0, size);
list_add ((struct list_head *)space, &fl->fl_list); list_add ((struct list_head *)space, &fl->fl_list);
space += size; space += size;
......
...@@ -1592,8 +1592,7 @@ sfw_post_rpc (srpc_client_rpc_t *rpc) ...@@ -1592,8 +1592,7 @@ sfw_post_rpc (srpc_client_rpc_t *rpc)
return; return;
} }
static srpc_service_t sfw_services[] = static srpc_service_t sfw_services[] = {
{
{ {
/* sv_id */ SRPC_SERVICE_DEBUG, /* sv_id */ SRPC_SERVICE_DEBUG,
/* sv_name */ "debug", /* sv_name */ "debug",
......
...@@ -1074,8 +1074,7 @@ static inline char *hai_dump_data_field(struct hsm_action_item *hai, ...@@ -1074,8 +1074,7 @@ static inline char *hai_dump_data_field(struct hsm_action_item *hai,
ptr = buffer; ptr = buffer;
sz = len; sz = len;
data_len = hai->hai_len - sizeof(*hai); data_len = hai->hai_len - sizeof(*hai);
for (i = 0 ; (i < data_len) && (sz > 0) ; i++) for (i = 0 ; (i < data_len) && (sz > 0) ; i++) {
{
int cnt; int cnt;
cnt = snprintf(ptr, sz, "%.2X", cnt = snprintf(ptr, sz, "%.2X",
......
...@@ -1168,8 +1168,7 @@ int ldlm_pools_recalc(ldlm_side_t client) ...@@ -1168,8 +1168,7 @@ int ldlm_pools_recalc(ldlm_side_t client)
*/ */
mutex_lock(ldlm_namespace_lock(client)); mutex_lock(ldlm_namespace_lock(client));
list_for_each_entry(ns, ldlm_namespace_list(client), list_for_each_entry(ns, ldlm_namespace_list(client),
ns_list_chain) ns_list_chain) {
{
if (ns->ns_appetite != LDLM_NAMESPACE_MODEST) if (ns->ns_appetite != LDLM_NAMESPACE_MODEST)
continue; continue;
......
...@@ -1248,8 +1248,7 @@ int ldlm_cli_update_pool(struct ptlrpc_request *req) ...@@ -1248,8 +1248,7 @@ int ldlm_cli_update_pool(struct ptlrpc_request *req)
__u32 new_limit; __u32 new_limit;
if (unlikely(!req->rq_import || !req->rq_import->imp_obd || if (unlikely(!req->rq_import || !req->rq_import->imp_obd ||
!imp_connect_lru_resize(req->rq_import))) !imp_connect_lru_resize(req->rq_import))) {
{
/* /*
* Do nothing for corner cases. * Do nothing for corner cases.
*/ */
......
...@@ -511,8 +511,7 @@ typedef struct { ...@@ -511,8 +511,7 @@ typedef struct {
cfs_hash_ops_t *nsd_hops; cfs_hash_ops_t *nsd_hops;
} ldlm_ns_hash_def_t; } ldlm_ns_hash_def_t;
ldlm_ns_hash_def_t ldlm_ns_hash_defs[] = ldlm_ns_hash_def_t ldlm_ns_hash_defs[] = {
{
{ {
.nsd_type = LDLM_NS_TYPE_MDC, .nsd_type = LDLM_NS_TYPE_MDC,
.nsd_bkt_bits = 11, .nsd_bkt_bits = 11,
......
...@@ -155,8 +155,7 @@ cfs_hash_rw_unlock(union cfs_hash_lock *lock, int exclusive) ...@@ -155,8 +155,7 @@ cfs_hash_rw_unlock(union cfs_hash_lock *lock, int exclusive)
} }
/** No lock hash */ /** No lock hash */
static cfs_hash_lock_ops_t cfs_hash_nl_lops = static cfs_hash_lock_ops_t cfs_hash_nl_lops = {
{
.hs_lock = cfs_hash_nl_lock, .hs_lock = cfs_hash_nl_lock,
.hs_unlock = cfs_hash_nl_unlock, .hs_unlock = cfs_hash_nl_unlock,
.hs_bkt_lock = cfs_hash_nl_lock, .hs_bkt_lock = cfs_hash_nl_lock,
...@@ -164,8 +163,7 @@ static cfs_hash_lock_ops_t cfs_hash_nl_lops = ...@@ -164,8 +163,7 @@ static cfs_hash_lock_ops_t cfs_hash_nl_lops =
}; };
/** no bucket lock, one spinlock to protect everything */ /** no bucket lock, one spinlock to protect everything */
static cfs_hash_lock_ops_t cfs_hash_nbl_lops = static cfs_hash_lock_ops_t cfs_hash_nbl_lops = {
{
.hs_lock = cfs_hash_spin_lock, .hs_lock = cfs_hash_spin_lock,
.hs_unlock = cfs_hash_spin_unlock, .hs_unlock = cfs_hash_spin_unlock,
.hs_bkt_lock = cfs_hash_nl_lock, .hs_bkt_lock = cfs_hash_nl_lock,
...@@ -173,8 +171,7 @@ static cfs_hash_lock_ops_t cfs_hash_nbl_lops = ...@@ -173,8 +171,7 @@ static cfs_hash_lock_ops_t cfs_hash_nbl_lops =
}; };
/** spin bucket lock, rehash is enabled */ /** spin bucket lock, rehash is enabled */
static cfs_hash_lock_ops_t cfs_hash_bkt_spin_lops = static cfs_hash_lock_ops_t cfs_hash_bkt_spin_lops = {
{
.hs_lock = cfs_hash_rw_lock, .hs_lock = cfs_hash_rw_lock,
.hs_unlock = cfs_hash_rw_unlock, .hs_unlock = cfs_hash_rw_unlock,
.hs_bkt_lock = cfs_hash_spin_lock, .hs_bkt_lock = cfs_hash_spin_lock,
...@@ -182,8 +179,7 @@ static cfs_hash_lock_ops_t cfs_hash_bkt_spin_lops = ...@@ -182,8 +179,7 @@ static cfs_hash_lock_ops_t cfs_hash_bkt_spin_lops =
}; };
/** rw bucket lock, rehash is enabled */ /** rw bucket lock, rehash is enabled */
static cfs_hash_lock_ops_t cfs_hash_bkt_rw_lops = static cfs_hash_lock_ops_t cfs_hash_bkt_rw_lops = {
{
.hs_lock = cfs_hash_rw_lock, .hs_lock = cfs_hash_rw_lock,
.hs_unlock = cfs_hash_rw_unlock, .hs_unlock = cfs_hash_rw_unlock,
.hs_bkt_lock = cfs_hash_rw_lock, .hs_bkt_lock = cfs_hash_rw_lock,
...@@ -191,8 +187,7 @@ static cfs_hash_lock_ops_t cfs_hash_bkt_rw_lops = ...@@ -191,8 +187,7 @@ static cfs_hash_lock_ops_t cfs_hash_bkt_rw_lops =
}; };
/** spin bucket lock, rehash is disabled */ /** spin bucket lock, rehash is disabled */
static cfs_hash_lock_ops_t cfs_hash_nr_bkt_spin_lops = static cfs_hash_lock_ops_t cfs_hash_nr_bkt_spin_lops = {
{
.hs_lock = cfs_hash_nl_lock, .hs_lock = cfs_hash_nl_lock,
.hs_unlock = cfs_hash_nl_unlock, .hs_unlock = cfs_hash_nl_unlock,
.hs_bkt_lock = cfs_hash_spin_lock, .hs_bkt_lock = cfs_hash_spin_lock,
...@@ -200,8 +195,7 @@ static cfs_hash_lock_ops_t cfs_hash_nr_bkt_spin_lops = ...@@ -200,8 +195,7 @@ static cfs_hash_lock_ops_t cfs_hash_nr_bkt_spin_lops =
}; };
/** rw bucket lock, rehash is disabled */ /** rw bucket lock, rehash is disabled */
static cfs_hash_lock_ops_t cfs_hash_nr_bkt_rw_lops = static cfs_hash_lock_ops_t cfs_hash_nr_bkt_rw_lops = {
{
.hs_lock = cfs_hash_nl_lock, .hs_lock = cfs_hash_nl_lock,
.hs_unlock = cfs_hash_nl_unlock, .hs_unlock = cfs_hash_nl_unlock,
.hs_bkt_lock = cfs_hash_rw_lock, .hs_bkt_lock = cfs_hash_rw_lock,
......
...@@ -88,8 +88,7 @@ static void ll_destroy_inodecache(void) ...@@ -88,8 +88,7 @@ static void ll_destroy_inodecache(void)
} }
/* exported operations */ /* exported operations */
struct super_operations lustre_super_operations = struct super_operations lustre_super_operations = {
{
.alloc_inode = ll_alloc_inode, .alloc_inode = ll_alloc_inode,
.destroy_inode = ll_destroy_inode, .destroy_inode = ll_destroy_inode,
.evict_inode = ll_delete_inode, .evict_inode = ll_delete_inode,
......
...@@ -2486,8 +2486,7 @@ int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp, ...@@ -2486,8 +2486,7 @@ int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
if (mea->mea_magic == MEA_MAGIC_LAST_CHAR || if (mea->mea_magic == MEA_MAGIC_LAST_CHAR ||
mea->mea_magic == MEA_MAGIC_ALL_CHARS || mea->mea_magic == MEA_MAGIC_ALL_CHARS ||
mea->mea_magic == MEA_MAGIC_HASH_SEGMENT) mea->mea_magic == MEA_MAGIC_HASH_SEGMENT) {
{
magic = le32_to_cpu(mea->mea_magic); magic = le32_to_cpu(mea->mea_magic);
} else { } else {
/* /*
......
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