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: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
index e988631..b82ba99 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
@@ -1675,8 +1675,7 @@ ksocknal_send_hello (lnet_ni_t *ni, ksock_conn_t *conn,
 static int
 ksocknal_invert_type(int type)
 {
-       switch (type)
-       {
+       switch (type) {
        case SOCKLND_CONN_ANY:
        case SOCKLND_CONN_CONTROL:
                return type;

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
index 050a58d..a60bfc9 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
@@ -756,8 +756,7 @@ ksocknal_unpack_msg_v2(ksock_msg_t *msg)
        return;  /* Do nothing */
 }
 
-ksock_proto_t  ksocknal_protocol_v1x =
-{
+ksock_proto_t  ksocknal_protocol_v1x = {
        .pro_version        = KSOCK_PROTO_V1,
        .pro_send_hello  = ksocknal_send_hello_v1,
        .pro_recv_hello  = ksocknal_recv_hello_v1,
@@ -770,8 +769,7 @@ ksock_proto_t  ksocknal_protocol_v1x =
        .pro_match_tx      = ksocknal_match_tx
 };
 
-ksock_proto_t  ksocknal_protocol_v2x =
-{
+ksock_proto_t  ksocknal_protocol_v2x = {
        .pro_version        = KSOCK_PROTO_V2,
        .pro_send_hello  = ksocknal_send_hello_v2,
        .pro_recv_hello  = ksocknal_recv_hello_v2,
@@ -784,8 +782,7 @@ ksock_proto_t  ksocknal_protocol_v2x =
        .pro_match_tx      = ksocknal_match_tx
 };
 
-ksock_proto_t  ksocknal_protocol_v3x =
-{
+ksock_proto_t  ksocknal_protocol_v3x = {
        .pro_version        = KSOCK_PROTO_V3,
        .pro_send_hello  = ksocknal_send_hello_v2,
        .pro_recv_hello  = ksocknal_recv_hello_v2,

diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index b28734a..2039083 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -384,8 +384,7 @@ lnet_freelist_init (lnet_freelist_t *fl, int n, int size)
        fl->fl_nobjs = n;
        fl->fl_objsize = size;
 
-       do
-       {
+       do {
                memset (space, 0, size);
                list_add ((struct list_head *)space, &fl->fl_list);
                space += size;

diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
index d01689a..df04ab7 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/framework.c
+++ b/drivers/staging/lustre/lnet/selftest/framework.c
@@ -1592,8 +1592,7 @@ sfw_post_rpc (srpc_client_rpc_t *rpc)
        return;
 }
 
-static srpc_service_t sfw_services[] =
-{
+static srpc_service_t sfw_services[] = {
        {
                /* sv_id */    SRPC_SERVICE_DEBUG,
                /* sv_name */  "debug",

diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
index 5a31304..28a6a83 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
@@ -1074,8 +1074,7 @@ static inline char *hai_dump_data_field(struct hsm_action_item *hai,
        ptr = buffer;
        sz = len;
        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;
 
                cnt = snprintf(ptr, sz, "%.2X",

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
index db36b3f..150b44d 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
@@ -1168,8 +1168,7 @@ int ldlm_pools_recalc(ldlm_side_t client)
                 */
                mutex_lock(ldlm_namespace_lock(client));
                list_for_each_entry(ns, ldlm_namespace_list(client),
-                                       ns_list_chain)
-               {
+                                       ns_list_chain) {
                        if (ns->ns_appetite != LDLM_NAMESPACE_MODEST)
                                continue;
 

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
index 37b8608..7fd4d67 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
@@ -1248,8 +1248,7 @@ int ldlm_cli_update_pool(struct ptlrpc_request *req)
        __u32 new_limit;
 
        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.
                 */

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
index efd45e5..8fec984 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
@@ -511,8 +511,7 @@ typedef struct {
        cfs_hash_ops_t *nsd_hops;
 } 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_bkt_bits   = 11,

diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c b/drivers/staging/lustre/lustre/libcfs/hash.c
index 8ef1deb..4228384 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/hash.c
+++ b/drivers/staging/lustre/lustre/libcfs/hash.c
@@ -155,8 +155,7 @@ cfs_hash_rw_unlock(union cfs_hash_lock *lock, int exclusive)
 }
 
 /** 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_unlock      = cfs_hash_nl_unlock,
        .hs_bkt_lock    = cfs_hash_nl_lock,
@@ -164,8 +163,7 @@ static cfs_hash_lock_ops_t cfs_hash_nl_lops =
 };
 
 /** 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_unlock      = cfs_hash_spin_unlock,
        .hs_bkt_lock    = cfs_hash_nl_lock,
@@ -173,8 +171,7 @@ static cfs_hash_lock_ops_t cfs_hash_nbl_lops =
 };
 
 /** 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_unlock      = cfs_hash_rw_unlock,
        .hs_bkt_lock    = cfs_hash_spin_lock,
@@ -182,8 +179,7 @@ static cfs_hash_lock_ops_t cfs_hash_bkt_spin_lops =
 };
 
 /** 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_unlock      = cfs_hash_rw_unlock,
        .hs_bkt_lock    = cfs_hash_rw_lock,
@@ -191,8 +187,7 @@ static cfs_hash_lock_ops_t cfs_hash_bkt_rw_lops =
 };
 
 /** 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_unlock      = cfs_hash_nl_unlock,
        .hs_bkt_lock    = cfs_hash_spin_lock,
@@ -200,8 +195,7 @@ static cfs_hash_lock_ops_t cfs_hash_nr_bkt_spin_lops =
 };
 
 /** 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_unlock      = cfs_hash_nl_unlock,
        .hs_bkt_lock    = cfs_hash_rw_lock,

diff --git a/drivers/staging/lustre/lustre/llite/super25.c b/drivers/staging/lustre/lustre/llite/super25.c
index 078c0e9..e61dbed 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/super25.c
+++ b/drivers/staging/lustre/lustre/llite/super25.c
@@ -88,8 +88,7 @@ static void ll_destroy_inodecache(void)
 }
 
 /* exported operations */
-struct super_operations lustre_super_operations =
-{
+struct super_operations lustre_super_operations = {
        .alloc_inode   = ll_alloc_inode,
        .destroy_inode = ll_destroy_inode,
        .evict_inode   = ll_delete_inode,

diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index a48818a..6038c53 100644 (file)
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -2486,8 +2486,7 @@ int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
 
        if (mea->mea_magic == MEA_MAGIC_LAST_CHAR ||
            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);
        } else {
                /*