Skip to contentSkip to conversation

Staging: lustre: Remove unnecessary else after return

PATCH In review aybuke ozdemir 2 participants 2 messages Feb 20, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: lustre: Remove unnecessary else after return

This patch fixes "else is not generally useful after
a break or return" checkpatch.pl warning using goto statement in lcommon_cl.c

---
 drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/lustre/lustre/lclient/lcommon_cl.c +2 -1
index 23095bb..b8311c6 100644
@@ -834,7 +834,7 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,
 				    size_index < cur_index)
 					*exceed = 1;
 			}
-			return result;
+			goto out;
 		} else {
 			/*
 			 * region is within kms and, hence, within real file
@@ -857,6 +857,7 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,
 		}
 	}
 	ccc_object_size_unlock(obj);
+out:
 	return result;
 }
 
Signature · 1 line
1.9.1
#1 lore raw
Quoted 7 lines · aybuke ozdemir

This patch fixes "else is not generally useful after
a break or return" checkpatch.pl warning using goto statement in lcommon_cl.c

---
 drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Looks good to me.

Jes

Quoted 22 lines
drivers/staging/lustre/lustre/lclient/lcommon_cl.c +2 -1
index 23095bb..b8311c6 100644
@@ -834,7 +834,7 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,
 				    size_index < cur_index)
 					*exceed = 1;
 			}
-			return result;
+			goto out;
 		} else {
 			/*
 			 * region is within kms and, hence, within real file
@@ -857,6 +857,7 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,
 		}
 	}
 	ccc_object_size_unlock(obj);
+out:
 	return result;
 }