Skip to contentSkip to conversation

afs: delete double assignment

PATCH In review Himangi Saraogi 2 participants 2 messages Jul 28, 2014 Afs filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 afs: delete double assignment

A simplified version of Coccinelle semantic match that finds this problem is as follows:

// <smpl>
@@
expression i;
@@

*i = ...;
i = ...;
// </smpl>

---
Should the second assignment is each case be a |= ?

 fs/afs/main.c | 3 ---
 1 file changed, 3 deletions(-)
fs/afs/main.c +0 -3
index 42dd2e4..a2f5a16 100644
@@ -54,13 +54,10 @@ static int __init afs_get_client_UUID(void)
 	uuidtime += AFS_UUID_TO_UNIX_TIME;
 	afs_uuid.time_low = uuidtime;
 	afs_uuid.time_mid = uuidtime >> 32;
-	afs_uuid.time_hi_and_version = (uuidtime >> 48) & AFS_UUID_TIMEHI_MASK;
 	afs_uuid.time_hi_and_version = AFS_UUID_VERSION_TIME;
 
 	get_random_bytes(&clockseq, 2);
 	afs_uuid.clock_seq_low = clockseq;
-	afs_uuid.clock_seq_hi_and_reserved =
-		(clockseq >> 8) & AFS_UUID_CLOCKHI_MASK;
 	afs_uuid.clock_seq_hi_and_reserved = AFS_UUID_VARIANT_STD;
 
 	_debug("AFS UUID: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
Signature · 1 line
1.9.1
maintainer
#1 lore raw

fs/afs/main.c static int __init afs_get_client_UUID(void) · line 61

Quoted 8 lines · Himangi Saraogi
fs/afs/main.c +0 -3
-	afs_uuid.time_hi_and_version = (uuidtime >> 48) & AFS_UUID_TIMEHI_MASK;
 	afs_uuid.time_hi_and_version = AFS_UUID_VERSION_TIME;
 
 	get_random_bytes(&clockseq, 2);
 	afs_uuid.clock_seq_low = clockseq;
-	afs_uuid.clock_seq_hi_and_reserved =
-		(clockseq >> 8) & AFS_UUID_CLOCKHI_MASK;
 	afs_uuid.clock_seq_hi_and_reserved = AFS_UUID_VARIANT_STD;

This might be the wrong thing to do. I wonder if the lines following the ones deleted should be "|=" rather than "=". I'll have a look into it.

David