Subject: + aoe-use-min-to-simplify-the-code.patch added to -mm tree
To: andriy.shevchenko@xxxxxxxxxxxxxxx,ecashin@xxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 07 Aug 2013 13:54:20 -0700
The patch titled
Subject: aoe: use min() to simplify the code
has been added to the -mm tree. Its filename is
aoe-use-min-to-simplify-the-code.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/aoe-use-min-to-simplify-the-code.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/aoe-use-min-to-simplify-the-code.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Subject: 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.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Cc: Ed Cashin <ecashin@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/aoe/aoedev.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff -puN drivers/block/aoe/aoedev.c~aoe-use-min-to-simplify-the-code drivers/block/aoe/aoedev.c
--- a/drivers/block/aoe/aoedev.c~aoe-use-min-to-simplify-the-code
+++ a/drivers/block/aoe/aoedev.c
@@ -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 ao
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);
}
_
Patches currently in -mm which might be from andriy.shevchenko@xxxxxxxxxxxxxxx are
aoe-remove-custom-implementation-of-kbasename.patch
aoe-use-min-to-simplify-the-code.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
