From 5256ca9bf2931fdf4d29bccb9edf905ec9416776 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 27 Jun 2012 15:27:24 -0700 Subject: [PATCH] --- yaml --- r: 311435 b: refs/heads/master c: a969dd139cc2f2bccdcb11894f0695517cf84d4d h: refs/heads/master i: 311433: 3c0bcef9c66df169e89a9aac53cd2790fea5ff97 311431: 571339148afe501f72c1b500038fd7750d1276c3 v: v3 --- [refs] | 2 +- trunk/net/9p/protocol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0288456b65e4..c793b5fe7c80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85f2f834e85517307f13e30e630a5fc86f757cb5 +refs/heads/master: a969dd139cc2f2bccdcb11894f0695517cf84d4d diff --git a/trunk/net/9p/protocol.c b/trunk/net/9p/protocol.c index 9ee48cb30179..3d33ecf13327 100644 --- a/trunk/net/9p/protocol.c +++ b/trunk/net/9p/protocol.c @@ -368,7 +368,7 @@ p9pdu_vwritef(struct p9_fcall *pdu, int proto_version, const char *fmt, const char *sptr = va_arg(ap, const char *); uint16_t len = 0; if (sptr) - len = min_t(uint16_t, strlen(sptr), + len = min_t(size_t, strlen(sptr), USHRT_MAX); errcode = p9pdu_writef(pdu, proto_version,