staging: lustre: Fix misplaced opening brace warnings

Fixes the following checkpatch error:

ERROR: that open brace { should be on the previous line

Signed-off-by: Srikrishan Malik <srikrishanmalik@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
index c03d77c9c5b8924a25237d8d99ea8640f7bb9821..288ce9119ed52931062b9d414d3087859df09430 100644 (file)
--- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
@@ -785,14 +785,18 @@ int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
        __u64             flags, saved_flags = extra_lock_flags;
        int                 rc;
        struct ldlm_res_id res_id;
-       static const ldlm_policy_data_t lookup_policy =
-                           { .l_inodebits = { MDS_INODELOCK_LOOKUP } };
-       static const ldlm_policy_data_t update_policy =
-                           { .l_inodebits = { MDS_INODELOCK_UPDATE } };
-       static const ldlm_policy_data_t layout_policy =
-                           { .l_inodebits = { MDS_INODELOCK_LAYOUT } };
+       static const ldlm_policy_data_t lookup_policy = {
+               .l_inodebits = { MDS_INODELOCK_LOOKUP }
+       };
+       static const ldlm_policy_data_t update_policy = {
+               .l_inodebits = { MDS_INODELOCK_UPDATE }
+       };
+       static const ldlm_policy_data_t layout_policy = {
+               .l_inodebits = { MDS_INODELOCK_LAYOUT }
+       };
        static const ldlm_policy_data_t getxattr_policy = {
-                             .l_inodebits = { MDS_INODELOCK_XATTR } };
+               .l_inodebits = { MDS_INODELOCK_XATTR }
+       };
        ldlm_policy_data_t const *policy = &lookup_policy;
        int                 generation, resends = 0;
        struct ldlm_reply     *lockrep;

diff --git a/drivers/staging/lustre/lustre/mdc/mdc_reint.c b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
index 46800335ca7d7bae1292f3ba196378091329cad6..01af30ac1a5224bfb07608a8fa723e359ac9ee69 100644 (file)
--- a/drivers/staging/lustre/lustre/mdc/mdc_reint.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
@@ -152,8 +152,7 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
 
        ptlrpc_request_set_replen(req);
        if (mod && (op_data->op_flags & MF_EPOCH_OPEN) &&
-           req->rq_import->imp_replayable)
-       {
+           req->rq_import->imp_replayable) {
                LASSERT(*mod == NULL);
 
                *mod = obd_mod_alloc();

diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 1dfe90e7418fe5c65695f1b0b5c978ccb8be6ffc..d6fd2118780669fb29b3cbd6d4ac30e748d31180 100644 (file)
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -1794,8 +1794,11 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                GOTO(out, rc);
        case OBD_IOC_CHANGELOG_CLEAR: {
                struct ioc_changelog *icc = karg;
-               struct changelog_setinfo cs =
-                       {.cs_recno = icc->icc_recno, .cs_id = icc->icc_id};
+               struct changelog_setinfo cs = {
+                       .cs_recno = icc->icc_recno,
+                       .cs_id = icc->icc_id
+               };
+
                rc = obd_set_info_async(NULL, exp, strlen(KEY_CHANGELOG_CLEAR),
                                        KEY_CHANGELOG_CLEAR, sizeof(cs), &cs,
                                        NULL);