Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1215826

[PATCH 3/8] staging: lustre: ldlm: put constant on the right of binary operator

Show all headers | View raw

Move constants to the right of binary operators.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
constant c;
expression e;
binary operator b = {==,!=,&,|};
@@

(
- c
+ e
b
- e
+ c
|
- c < e
+ e > c
)
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
index a4c252f..ab670fc 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
@@ -602,7 +602,7 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
 	    (LDLM_FL_FAILED|LDLM_FL_LOCAL_ONLY)) {
 		if (lock->l_req_mode == lock->l_granted_mode &&
 		    lock->l_granted_mode != LCK_NL &&
-		    NULL == data)
+		    data == NULL)
 			ldlm_lock_decref_internal(lock, lock->l_req_mode);
 
 		/* Need to wake up the waiter if we were evicted */
@@ -614,7 +614,7 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
 
 	if (!(flags & (LDLM_FL_BLOCK_WAIT | LDLM_FL_BLOCK_GRANTED |
 		       LDLM_FL_BLOCK_CONV))) {
-		if (NULL == data)
+		if (data == NULL)
 			/* mds granted the lock in the reply */
 			goto granted;
 		/* CP AST RPC: lock get granted, wake it up */
@@ -627,10 +627,10 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
 	obd = class_exp2obd(lock->l_conn_export);
 
 	/* if this is a local lock, there is no import */
-	if (NULL != obd)
+	if (obd != NULL)
 		imp = obd->u.cli.cl_import;
 
-	if (NULL != imp) {
+	if (imp != NULL) {
 		spin_lock(&imp->imp_lock);
 		fwd.fwd_generation = imp->imp_generation;
 		spin_unlock(&imp->imp_lock);

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/8] put constant on the right of binary operator Julia Lawall <Julia.Lawall@lip6.fr> - 2015-08-29 19:50 +0200
  [PATCH 7/8] staging: lustre: osc: put constant on the right of binary operator Julia Lawall <Julia.Lawall@lip6.fr> - 2015-08-29 19:50 +0200
  [PATCH 1/8] staging: lustre: include: put constant on the right of binary operator Julia Lawall <Julia.Lawall@lip6.fr> - 2015-08-29 19:50 +0200
  [PATCH 8/8] staging: lustre: put constant on the right of binary operator Julia Lawall <Julia.Lawall@lip6.fr> - 2015-08-29 19:50 +0200
    Re: [PATCH 8/8] staging: lustre: put constant on the right of  binary operator Joe Perches <joe@perches.com> - 2015-08-30 02:00 +0200
      Re: [PATCH 8/8] staging: lustre: put constant on the right of binary  operator Julia Lawall <julia.lawall@lip6.fr> - 2015-08-30 10:50 +0200
      Re: [PATCH 8/8] staging: lustre: put constant on the right of binary  operator Julia Lawall <julia.lawall@lip6.fr> - 2015-08-30 19:20 +0200
  [PATCH 6/8] Staging: lustre: obd: put constant on the right of binary operator Julia Lawall <Julia.Lawall@lip6.fr> - 2015-08-29 19:50 +0200
  [PATCH 3/8] staging: lustre: ldlm: put constant on the right of binary operator Julia Lawall <Julia.Lawall@lip6.fr> - 2015-08-29 19:50 +0200
  [PATCH 2/8] staging: lustre: lnet: lib-ptl.c: put constant on the right of binary operator Julia Lawall <Julia.Lawall@lip6.fr> - 2015-08-29 19:50 +0200
  [PATCH 5/8] staging: lustre: llite: put constant on the right of binary operator Julia Lawall <Julia.Lawall@lip6.fr> - 2015-08-29 19:50 +0200
  [PATCH 4/8] staging: lustre: libcfs: put constant on the right of binary operator Julia Lawall <Julia.Lawall@lip6.fr> - 2015-08-29 19:50 +0200

csiph-web