Module Name: src
Committed By: christos
Date: Sun Mar 6 19:47:41 UTC 2016
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
PR/50900: David Binderman: optimize memset
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/sys/rump/librump/rumpvfs/rumpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.138 src/sys/rump/librump/rumpvfs/rumpfs.c:1.139
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.138 Tue Feb 2 08:02:34 2016
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Sun Mar 6 14:47:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.138 2016/02/02 13:02:34 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.139 2016/03/06 19:47:41 christos Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.138 2016/02/02 13:02:34 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.139 2016/03/06 19:47:41 christos Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -933,8 +933,8 @@ rump_vop_setattr(void *v)
return ENOSPC;
copylen = MIN(rn->rn_dlen, newlen);
- memset(newdata, 0, newlen);
memcpy(newdata, rn->rn_data, copylen);
+ memset(newdata + copylen, 0, newlen - copylen);
if ((rn->rn_flags & RUMPNODE_EXTSTORAGE) == 0) {
rump_hyperfree(rn->rn_data, rn->rn_dlen);
