Skip to contentSkip to conversation

aoe: remove custom implementation of kbasename()

PATCH In review Andy Shevchenko 2 participants 5 messages Aug 1, 2013 – Aug 2, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 aoe: remove custom implementation of kbasename()

In the kernel we have a nice helper that may be used here. This patch substitutes the custom implementation by the native function call.

---
 drivers/block/aoe/aoedev.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/block/aoe/aoedev.c +3 -6
index 784c92e..db35ef6 100644
@@ -12,6 +12,7 @@
 #include <linux/bitmap.h>
 #include <linux/kdev_t.h>
 #include <linux/moduleparam.h>
+#include <linux/string.h>
 #include "aoe.h"
 
 static void dummy_timer(ulong);
@@ -241,16 +242,12 @@ aoedev_downdev(struct aoedev *d)
 static int
 user_req(char *s, size_t slen, struct aoedev *d)
 {
-	char *p;
+	const char *p;
 	size_t lim;
 
 	if (!d->gd)
 		return 0;
-	p = strrchr(d->gd->disk_name, '/');
-	if (!p)
-		p = d->gd->disk_name;
-	else
-		p += 1;
+	p = kbasename(d->gd->disk_name);
 	lim = sizeof(d->gd->disk_name);
 	lim -= p - d->gd->disk_name;
 	if (slen < lim)
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 2/2 aoe: use min() to simplify the code

min() incorporates condition in it. In our case we could do assignment and make a choice at once.

---
 drivers/block/aoe/aoedev.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/block/aoe/aoedev.c +2 -4
index db35ef6..92fadfa 100644
@@ -13,6 +13,7 @@
 #include <linux/kdev_t.h>
 #include <linux/moduleparam.h>
 #include <linux/string.h>
+#include <linux/kernel.h>
 #include "aoe.h"
 
 static void dummy_timer(ulong);
@@ -248,10 +249,7 @@ user_req(char *s, size_t slen, struct aoedev *d)
 	if (!d->gd)
 		return 0;
 	p = kbasename(d->gd->disk_name);
-	lim = sizeof(d->gd->disk_name);
-	lim -= p - d->gd->disk_name;
-	if (slen < lim)
-		lim = slen;
+	lim = min(sizeof(d->gd->disk_name) - (p - d->gd->disk_name), slen);
 
 	return !strncmp(s, p, lim);
 }
Signature · 1 line
1.8.3.2
#2 lore raw

Re: [PATCH 2/2] aoe: use min() to simplify the code

Thanks.

I agree that we could do that. I'm not sure it increases readability to put this much stuff on one line, though. What is the motivation?

Quoted 35 lines · Andy Shevchenko

min() incorporates condition in it. In our case we could do assignment and make a choice at once.

---
drivers/block/aoe/aoedev.c | 6 ++----

1 file changed, 2 insertions(+), 4 deletions(-)
drivers/block/aoe/aoedev.c +2 -4
index db35ef6..92fadfa 100644
@@ -13,6 +13,7 @@
 #include <linux/kdev_t.h>
 #include <linux/moduleparam.h>
 #include <linux/string.h>
+#include <linux/kernel.h>
 #include "aoe.h"
 
 static void dummy_timer(ulong);
@@ -248,10 +249,7 @@ user_req(char *s, size_t slen, struct aoedev *d)
 	if (!d->gd)
 		return 0;
 	p = kbasename(d->gd->disk_name);
-	lim = sizeof(d->gd->disk_name);
-	lim -= p - d->gd->disk_name;
-	if (slen < lim)
-		lim = slen;
+	lim = min(sizeof(d->gd->disk_name) - (p - d->gd->disk_name), slen);
 
 	return !strncmp(s, p, lim);
 }
Signature · 1 line
1.8.3.2
Signature · 2 lines
  Ed Cashin
  [email protected]
#3 lore raw

Re: [PATCH 2/2] aoe: use min() to simplify the code

Quoted 3 lines · Ed Cashin

Thanks.

I agree that we could do that. I'm not sure it increases readability to put this much stuff on one line, though. What is the motivation?

Motivation is to explicitly show that that operation is to calculate a minimum of two the slen parameter and the length of last part of the disk_name.

It seems matter of taste, so, I'm okay with current piece of code.

Quoted 36 lines
Quoted 35 lines

min() incorporates condition in it. In our case we could do assignment and make a choice at once.

---
drivers/block/aoe/aoedev.c | 6 ++----

1 file changed, 2 insertions(+), 4 deletions(-)
drivers/block/aoe/aoedev.c +2 -4
index db35ef6..92fadfa 100644
@@ -13,6 +13,7 @@
 #include <linux/kdev_t.h>
 #include <linux/moduleparam.h>
 #include <linux/string.h>
+#include <linux/kernel.h>
 #include "aoe.h"
 
 static void dummy_timer(ulong);
@@ -248,10 +249,7 @@ user_req(char *s, size_t slen, struct aoedev *d)
 	if (!d->gd)
 		return 0;
 	p = kbasename(d->gd->disk_name);
-	lim = sizeof(d->gd->disk_name);
-	lim -= p - d->gd->disk_name;
-	if (slen < lim)
-		lim = slen;
+	lim = min(sizeof(d->gd->disk_name) - (p - d->gd->disk_name), slen);
 
 	return !strncmp(s, p, lim);
 }
Signature · 1 line
1.8.3.2
Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#4 lore raw
In reply to Andy Shevchenko

Looks OK. Thanks.

Quoted 42 lines · Andy Shevchenko

In the kernel we have a nice helper that may be used here. This patch substitutes the custom implementation by the native function call.

---
drivers/block/aoe/aoedev.c | 9 +++------

1 file changed, 3 insertions(+), 6 deletions(-)
drivers/block/aoe/aoedev.c +1 -0
index 784c92e..db35ef6 100644
@@ -12,6 +12,7 @@
 #include <linux/bitmap.h>
 #include <linux/kdev_t.h>
 #include <linux/moduleparam.h>
+#include <linux/string.h>
 #include "aoe.h"
 
 static void dummy_timer(ulong);
@@ -241,16 +242,12 @@ aoedev_downdev(struct aoedev *d)

static int
user_req(char *s, size_t slen, struct aoedev *d)
{

drivers/block/aoe/aoedev.c +1 -1
-	char *p;
+	const char *p;
	size_t lim;

	if (!d->gd)
		return 0;
drivers/block/aoe/aoedev.c +1 -5
-	p = strrchr(d->gd->disk_name, '/');
-	if (!p)
-		p = d->gd->disk_name;
-	else
-		p += 1;
+	p = kbasename(d->gd->disk_name);
	lim = sizeof(d->gd->disk_name);
	lim -= p - d->gd->disk_name;
	if (slen < lim)
Signature · 1 line
1.8.3.2
Signature · 2 lines
  Ed Cashin
  [email protected]