From: Georgiana Rodica Chelu <georgiana.chelu93@gmail.com>
Date: Tue, 18 Mar 2014 15:26:57 +0000 (+0200)
Subject: staging: luster: do not combine value 0 with |
X-Git-Tag: MMI-PSA29.97-13-9~12500^2~97
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=34d1f637cbf04eb88db10605338ccc6f8e9dedb8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

staging: luster: do not combine value 0 with |

There is no point in combining a variable
that is 0 with other things with |

The semantic patch used:

@@
expression x,e,e1;
statement S;
@@

if (x == 0) {
 <... when != x = e1
      when != while(...) S
      when != for(...;...;...) S

-  x |= e
+  x  = e
  ...>
}

Signed-off-by: Georgiana Rodica Chelu <georgiana.chelu93@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/lustre/lustre/llite/llite_mmap.c b/drivers/staging/lustre/lustre/llite/llite_mmap.c
index f0bc4bf9986b..90b2c0d275f9 100644
--- a/drivers/staging/lustre/lustre/llite/llite_mmap.c
+++ b/drivers/staging/lustre/lustre/llite/llite_mmap.c
@@ -370,7 +370,7 @@ restart:
 			goto restart;
 		}
 
-		result |= VM_FAULT_LOCKED;
+		result = VM_FAULT_LOCKED;
 	}
 	cfs_restore_sigs(set);
 	return result;