Skip to contentSkip to conversation

Staging: lustre: Fix return does not need parantheses

PATCH In review Monam Agarwal 2 participants 2 messages Jan 11, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 Staging: lustre: Fix return does not need parantheses

The patch fixes the following checkpatch.pl error in lustre/ldlm/ldlm_flock.c
ERROR: return is not a function, parentheses are not required

---
 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c +4 -4
index c9aae13..07a2c33 100644
@@ -81,18 +81,18 @@ int ldlm_flock_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 static inline int
 ldlm_same_flock_owner(struct ldlm_lock *lock, struct ldlm_lock *new)
 {
-	return((new->l_policy_data.l_flock.owner ==
+	return (new->l_policy_data.l_flock.owner ==
 		lock->l_policy_data.l_flock.owner) &&
-	       (new->l_export == lock->l_export));
+	       (new->l_export == lock->l_export);
 }
 
 static inline int
 ldlm_flocks_overlap(struct ldlm_lock *lock, struct ldlm_lock *new)
 {
-	return((new->l_policy_data.l_flock.start <=
+	return (new->l_policy_data.l_flock.start <=
 		lock->l_policy_data.l_flock.end) &&
 	       (new->l_policy_data.l_flock.end >=
-		lock->l_policy_data.l_flock.start));
+		lock->l_policy_data.l_flock.start);
 }
 
 static inline void ldlm_flock_blocking_link(struct ldlm_lock *req,
Signature · 1 line
1.7.9.5
maintainer
#1 lore raw
Quoted 5 lines · Monam Agarwal

The patch fixes the following checkpatch.pl error in lustre/ldlm/ldlm_flock.c
ERROR: return is not a function, parentheses are not required

I'm totally confused here. You have multiple series of patches, sent with different version numbers, some with the same subjects, and some not.

I've deleted all of your lustre patches from my queue because of this, I don't want to apply something incorrectly.

Please step back, take a day, and resend all of your pending patches that I have not applied for the lustre code, in a single series, so I know what I should be looking at here.

There's no rush, so please take your time and do your best to keep an overworked maintainer from getting things wrong.

thanks,

greg k-h