[PATCH 1/3] Refactor _marker_set_probe_range

Save one indention depth in _marker_set_probe_range by inverting the
central test.

Signed-off-by: Jan Kiszka <[email protected]>

---
 kernel/module.c |  100 ++++++++++++++++++++++++++------------------------------
 1 file changed, 48 insertions(+), 52 deletions(-)

Index: linux-2.6.21.1/kernel/module.c
===================================================================
--- linux-2.6.21.1.orig/kernel/module.c
+++ linux-2.6.21.1/kernel/module.c
@@ -339,64 +339,60 @@ static int _marker_set_probe_range(int f
 	int found = 0;
 
 	for (iter = begin; iter < end; iter++) {
-		if (strcmp(name, iter->mdata->name) == 0) {
-			if (format
-				&& strcmp(format, iter->mdata->format) != 0) {
-				printk(KERN_NOTICE
-					"Format mismatch for probe %s "
-					"(%s), marker (%s)\n",
-					name,
-					format,
-					iter->mdata->format);
-				continue;
-			}
-			if (flags & MF_LOCKDEP
-				&& !(iter->mdata->flags & MF_LOCKDEP)) {
-					printk(KERN_NOTICE
-					"Incompatible lockdep flags for "
-					"probe %s\n",
-					name);
-					continue;
-			}
-			if (flags & MF_PRINTK
-				&& !(iter->mdata->flags & MF_PRINTK)) {
+		if (strcmp(name, iter->mdata->name) != 0)
+			continue;
+
+		if (format && strcmp(format, iter->mdata->format) != 0) {
+			printk(KERN_NOTICE
+				"Format mismatch for probe %s "
+				"(%s), marker (%s)\n",
+				name,
+				format,
+				iter->mdata->format);
+			continue;
+		}
+		if (flags & MF_LOCKDEP
+			&& !(iter->mdata->flags & MF_LOCKDEP)) {
+			printk(KERN_NOTICE
+				"Incompatible lockdep flags for "
+				"probe %s\n",
+				name);
+			continue;
+		}
+		if (flags & MF_PRINTK
+			&& !(iter->mdata->flags & MF_PRINTK)) {
+			printk(KERN_NOTICE
+				"Incompatible printk flags for "
+				"probe %s\n",
+				name);
+			continue;
+		}
+		if (probe == __mark_empty_function) {
+			if (iter->mdata->call != __mark_empty_function)
+				iter->mdata->call = __mark_empty_function;
+			marker_set_enable(iter->enable, 0,
+				iter->mdata->flags);
+		} else {
+			if (iter->mdata->call != __mark_empty_function) {
+				if (iter->mdata->call != probe) {
 					printk(KERN_NOTICE
-					"Incompatible printk flags for "
-					"probe %s\n",
-					name);
+						"Marker %s busy, "
+						"probe %p already "
+						"installed\n",
+						name,
+						iter->mdata->call);
 					continue;
-			}
-			if (probe == __mark_empty_function) {
-				if (iter->mdata->call
-					!= __mark_empty_function) {
-					iter->mdata->call =
-						__mark_empty_function;
 				}
-				marker_set_enable(iter->enable, 0,
-					iter->mdata->flags);
 			} else {
-				if (iter->mdata->call
-					!= __mark_empty_function) {
-					if (iter->mdata->call != probe) {
-						printk(KERN_NOTICE
-							"Marker %s busy, "
-							"probe %p already "
-							"installed\n",
-							name,
-							iter->mdata->call);
-						continue;
-					}
-				} else {
-					found++;
-					iter->mdata->call = probe;
-				}
-				iter->mdata->pdata = pdata;
-				smp_wmb();
-				marker_set_enable(iter->enable, 1,
-					iter->mdata->flags);
+				found++;
+				iter->mdata->call = probe;
 			}
-			found++;
+			iter->mdata->pdata = pdata;
+			smp_wmb();
+			marker_set_enable(iter->enable, 1,
+				iter->mdata->flags);
 		}
+		found++;
 	}
 	return found;
 }

_______________________________________________
Ltt-dev mailing list
[email protected]
http://listserv.shafik.org/mailman/listinfo/ltt-dev

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iD8DBQFGRO8OniDOoMHTA+kRAmvuAJ4hZVaR8sk7SI7vZIMtiYP/uPrc4wCeOP95
ZbfHZ7GBHPvta5aGinZJIsM=
=EGay
-----END PGP SIGNATURE-----