The patch titled
Subject: sunrpc/cache: simplify qword_add
has been removed from the -mm tree. Its filename was
lib-string_helpersc-change-semantics-of-string_escape_mem-fix.patch
This patch was dropped because it was folded into lib-string_helpersc-change-semantics-of-string_escape_mem.patch
------------------------------------------------------
From: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Subject: sunrpc/cache: simplify qword_add
The commit 7572d3b29896 (lib/string_helpers.c: change semantics of
string_escape_mem) updates qword_add() to follow the changes in
lib/string_helpers.c. This patch simplifies the approach.
Andrew, I think this one can be folded in the mentioned commit by Rasmus.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/sunrpc/cache.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN net/sunrpc/cache.c~lib-string_helpersc-change-semantics-of-string_escape_mem-fix net/sunrpc/cache.c
--- a/net/sunrpc/cache.c~lib-string_helpersc-change-semantics-of-string_escape_mem-fix
+++ a/net/sunrpc/cache.c
@@ -1068,16 +1068,16 @@ void qword_add(char **bpp, int *lp, char
{
char *bp = *bpp;
int len = *lp;
- int ret, written;
+ int ret;
if (len < 0) return;
ret = string_escape_str(str, bp, len, ESCAPE_OCTAL, "\\ \n\t");
- written = min(ret, len);
- bp += written;
if (ret >= len)
+ bp += len;
len = -1;
else {
+ bp += ret;
len -= ret;
*bp++ = ' ';
len--;
_
Patches currently in -mm which might be from andriy.shevchenko@xxxxxxxxxxxxxxx are
origin.patch
lib-vsprintfc-fix-potential-null-deref-in-hex_string.patch
lib-string_helpersc-refactor-string_escape_mem.patch
lib-string_helpersc-change-semantics-of-string_escape_mem.patch
lib-string_helpersc-change-semantics-of-string_escape_mem-fix-fix.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
