[PATCH v3 1/3] staging: lustre: lov: Cleanup lov_check_set() in lov_request.c

From: Riccardo Lucchese
Date: Mon Jul 21 2014 - 06:16:33 EST


Make the code clearer by introducing a local variable and removing the
unnecessary 'if' statement.

Signed-off-by: Riccardo Lucchese <riccardo.lucchese@xxxxxxxxx>
Acked-by: Julia Lawall <julia.lawall@xxxxxxx>
---
Changes in v3:
- Renamed the local variable 'desc' to 'tgt' to be consistent with
other definitions in the driver.

Changes in v2:
- Improved the commit message:
- changed the subject line to follow the same convention used by
previous commits to the same file.
- rewrote the message body using a more formal language.
- Introduced a local variable to make the code clearer.
- Added Acked-by - Julia.

drivers/staging/lustre/lustre/lov/lov_request.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/lustre/lustre/lov/lov_request.c b/drivers/staging/lustre/lustre/lov/lov_request.c
index ce830e4..da424de 100644
--- a/drivers/staging/lustre/lustre/lov/lov_request.c
+++ b/drivers/staging/lustre/lustre/lov/lov_request.c
@@ -140,14 +140,14 @@ void lov_set_add_req(struct lov_request *req, struct lov_request_set *set)

static int lov_check_set(struct lov_obd *lov, int idx)
{
- int rc = 0;
+ int rc;
+ struct lov_tgt_desc *tgt;
mutex_lock(&lov->lov_lock);

- if (lov->lov_tgts[idx] == NULL ||
- lov->lov_tgts[idx]->ltd_active ||
- (lov->lov_tgts[idx]->ltd_exp != NULL &&
- class_exp2cliimp(lov->lov_tgts[idx]->ltd_exp)->imp_connect_tried))
- rc = 1;
+ tgt = lov->lov_tgts[idx];
+ rc = !tgt || tgt->ltd_active ||
+ (tgt->ltd_exp &&
+ class_exp2cliimp(tgt->ltd_exp)->imp_connect_tried);

mutex_unlock(&lov->lov_lock);
return rc;
--
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/