Module Name: src Committed By: martin Date: Sat Sep 14 21:11:46 UTC 2013
Modified Files: src/sys/nfs: nfs_export.c Log Message: Guard a function local CTASSERT with pro/epilogue To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/nfs/nfs_export.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/nfs/nfs_export.c diff -u src/sys/nfs/nfs_export.c:1.54 src/sys/nfs/nfs_export.c:1.55 --- src/sys/nfs/nfs_export.c:1.54 Fri Aug 30 07:35:44 2013 +++ src/sys/nfs/nfs_export.c Sat Sep 14 21:11:45 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_export.c,v 1.54 2013/08/30 07:35:44 dholland Exp $ */ +/* $NetBSD: nfs_export.c,v 1.55 2013/09/14 21:11:45 martin Exp $ */ /*- * Copyright (c) 1997, 1998, 2004, 2005, 2008 The NetBSD Foundation, Inc. @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nfs_export.c,v 1.54 2013/08/30 07:35:44 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nfs_export.c,v 1.55 2013/09/14 21:11:45 martin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -449,7 +449,9 @@ nfs_export_update_30(struct mount *mp, c * The following code assumes export_args has not * changed since export_args30, so check that. */ + __CT_LOCAL_PROLOGUE __CTASSERT(sizeof(args->eargs) == sizeof(*mel.mel_exports)); + __CT_LOCAL_EPILOGUE mel.mel_nexports = 1; mel.mel_exports = (void *)&args->eargs;