[PATCH v2 1/3] staging: lustre: libcfs: Use swap() in cfs_hash_bd_order()

[PATCH v2 1/3] staging: lustre: libcfs: Use swap() in cfs_hash_bd_order()

[Amitoj Kaur Chawla]

Use swap() function instead of using a temporary variable for swapping
two variables.

The Coccinelle semantic patch used to make this change is as follows:
//<smpl>
@@
type T;
T a,b,c;
@@
- a = b;
- b = c;
- c = a;
+ swap(b, c);
//<smpl>

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
---
Changes in v2:
        -Divided one patch into a series.

 drivers/staging/lustre/lustre/libcfs/hash.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c b/drivers/staging/lustre/lustre/libcfs/hash.c
index 5e2afe4..c8d8bc8 100644
--- a/drivers/staging/lustre/lustre/libcfs/hash.c
+++ b/drivers/staging/lustre/lustre/libcfs/hash.c
@@ -803,12 +803,8 @@ cfs_hash_bd_order(struct cfs_hash_bd *bd1, struct cfs_hash_bd *bd2)
 	if (rc == 0) {
 		bd2->bd_bucket = NULL;
 
-	} else if (rc > 0) { /* swab bd1 and bd2 */
-		struct cfs_hash_bd tmp;
-
-		tmp = *bd2;
-		*bd2 = *bd1;
-		*bd1 = tmp;
+	} else if (rc > 0) {
+		swap(*bd1, *bd2); /* swab bd1 and bd2 */
 	}
 }
 
-- 
1.9.1

[PATCH v2 2/3] staging: lustre: libcfs: Remove unnecessary braces

[Amitoj Kaur Chawla]

Removed unncessary braces from the if-else block to remove the
following checkpatch.pl warning:
WARNING: braces {} are not necessary for any arm of this statement

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
---
Changes in v2:
        -Divide one patch into a series.

 drivers/staging/lustre/lustre/libcfs/hash.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c b/drivers/staging/lustre/lustre/libcfs/hash.c
index c8d8bc8..b9bdb67 100644
--- a/drivers/staging/lustre/lustre/libcfs/hash.c
+++ b/drivers/staging/lustre/lustre/libcfs/hash.c
@@ -800,12 +800,10 @@ cfs_hash_bd_order(struct cfs_hash_bd *bd1, struct cfs_hash_bd *bd2)
 	}
 
 	rc = cfs_hash_bd_compare(bd1, bd2);
-	if (rc == 0) {
+	if (rc == 0)
 		bd2->bd_bucket = NULL;
-
-	} else if (rc > 0) {
+	else if (rc > 0)
 		swap(*bd1, *bd2); /* swab bd1 and bd2 */
-	}
 }
 
 void
-- 
1.9.1

[PATCH v2 3/3] staging: lustre: libcfs: Remove comparison with zero

[Amitoj Kaur Chawla]

Replace comparison with zero with ! operator.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
---
Changes in v2:
        -Divide one patch into a series.

 drivers/staging/lustre/lustre/libcfs/hash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c b/drivers/staging/lustre/lustre/libcfs/hash.c
index b9bdb67..a645f50 100644
--- a/drivers/staging/lustre/lustre/libcfs/hash.c
+++ b/drivers/staging/lustre/lustre/libcfs/hash.c
@@ -800,7 +800,7 @@ cfs_hash_bd_order(struct cfs_hash_bd *bd1, struct cfs_hash_bd *bd2)
 	}
 
 	rc = cfs_hash_bd_compare(bd1, bd2);
-	if (rc == 0)
+	if (!rc)
 		bd2->bd_bucket = NULL;
 	else if (rc > 0)
 		swap(*bd1, *bd2); /* swab bd1 and bd2 */
-- 
1.9.1

Re: [Outreachy kernel] [PATCH v2 1/3] staging: lustre: libcfs: Use swap() in cfs_hash_bd_order()

[Julia Lawall]

On Tue, 23 Feb 2016, Amitoj Kaur Chawla wrote:

> Use swap() function instead of using a temporary variable for swapping
> two variables.
> 
> The Coccinelle semantic patch used to make this change is as follows:
> //<smpl>
> @@
> type T;
> T a,b,c;
> @@
> - a = b;
> - b = c;
> - c = a;
> + swap(b, c);
> //<smpl>
> 
> Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
> ---
> Changes in v2:
>         -Divided one patch into a series.
> 
>  drivers/staging/lustre/lustre/libcfs/hash.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c b/drivers/staging/lustre/lustre/libcfs/hash.c
> index 5e2afe4..c8d8bc8 100644
> --- a/drivers/staging/lustre/lustre/libcfs/hash.c
> +++ b/drivers/staging/lustre/lustre/libcfs/hash.c
> @@ -803,12 +803,8 @@ cfs_hash_bd_order(struct cfs_hash_bd *bd1, struct cfs_hash_bd *bd2)
>  	if (rc == 0) {
>  		bd2->bd_bucket = NULL;
>  
> -	} else if (rc > 0) { /* swab bd1 and bd2 */
> -		struct cfs_hash_bd tmp;
> -
> -		tmp = *bd2;
> -		*bd2 = *bd1;
> -		*bd1 = tmp;
> +	} else if (rc > 0) {
> +		swap(*bd1, *bd2); /* swab bd1 and bd2 */

I think it would be reasonable to fix the spelling mistake in the comment 
as well.

julia

>  	}
>  }
>  
> -- 
> 1.9.1
> 
> -- 
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/ab41303260243d22196ab846c092faac61ae6bf4.1456236436.git.amitoj1606%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
> 

Re: [Outreachy kernel] [PATCH v2 1/3] staging: lustre: libcfs: Use swap() in cfs_hash_bd_order()

[Amitoj Kaur Chawla]

On Wed, Feb 24, 2016 at 12:55 AM, Julia Lawall <julia.lawall@lip6.fr> wrote:
>> +             swap(*bd1, *bd2); /* swab bd1 and bd2 */
>
> I think it would be reasonable to fix the spelling mistake in the comment
> as well.
>
> julia

Oops. Didn't notice that :)
I'll send v3.

Amitoj