diff options
| author | Matthew Ahrens <mahrens@delphix.com> | 2016-08-01 19:31:11 -0700 |
|---|---|---|
| committer | Matthew Ahrens <mahrens@delphix.com> | 2016-08-02 09:56:32 -0700 |
| commit | 6c60cf15430935d55cc9424e9f4c70acd8592df3 (patch) | |
| tree | 7b2b61fbdee6cafa70b82de8539da6f34ef79d3b | |
| parent | 12b90ee2d3b10689fc45f4930d2392f5fe1d9cfa (diff) | |
| download | illumos-joyent-6c60cf15430935d55cc9424e9f4c70acd8592df3.tar.gz | |
7229 dangerous macros in sdev_impl.h
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Eric Diven <eric.diven@delphix.com>
Reviewed by: Alex Reece <alex@delphix.com>
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Chris Siden <christopher.siden@delphix.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>
| -rw-r--r-- | usr/src/uts/common/sys/fs/sdev_impl.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/usr/src/uts/common/sys/fs/sdev_impl.h b/usr/src/uts/common/sys/fs/sdev_impl.h index 561939fc20..1223c91862 100644 --- a/usr/src/uts/common/sys/fs/sdev_impl.h +++ b/usr/src/uts/common/sys/fs/sdev_impl.h @@ -21,6 +21,7 @@ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2015, 2016 Joyent, Inc. All rights reserved. + * Copyright (c) 2014 by Delphix. All rights reserved. */ #ifndef _SYS_SDEV_IMPL_H @@ -581,20 +582,20 @@ extern int sdev_debug; #define sdcmn_err13(args) if (sdev_debug & SDEV_DEBUG_ZVOL) printf args #define impossible(args) printf args #else -#define sdcmn_err(args) /* does nothing */ -#define sdcmn_err2(args) /* does nothing */ -#define sdcmn_err3(args) /* does nothing */ -#define sdcmn_err4(args) /* does nothing */ -#define sdcmn_err5(args) /* does nothing */ -#define sdcmn_err6(args) /* does nothing */ -#define sdcmn_err7(args) /* does nothing */ -#define sdcmn_err8(args) /* does nothing */ -#define sdcmn_err9(args) /* does nothing */ -#define sdcmn_err10(args) /* does nothing */ -#define sdcmn_err11(args) /* does nothing */ -#define sdcmn_err12(args) /* does nothing */ -#define sdcmn_err13(args) /* does nothing */ -#define impossible(args) /* does nothing */ +#define sdcmn_err(args) ((void)0) +#define sdcmn_err2(args) ((void)0) +#define sdcmn_err3(args) ((void)0) +#define sdcmn_err4(args) ((void)0) +#define sdcmn_err5(args) ((void)0) +#define sdcmn_err6(args) ((void)0) +#define sdcmn_err7(args) ((void)0) +#define sdcmn_err8(args) ((void)0) +#define sdcmn_err9(args) ((void)0) +#define sdcmn_err10(args) ((void)0) +#define sdcmn_err11(args) ((void)0) +#define sdcmn_err12(args) ((void)0) +#define sdcmn_err13(args) ((void)0) +#define impossible(args) ((void)0) #endif #ifdef DEBUG @@ -606,7 +607,7 @@ extern int sdev_debug; __LINE__); \ } #else -#define SD_TRACE_FAILED_LOOKUP(ddv, nm, retried) +#define SD_TRACE_FAILED_LOOKUP(ddv, nm, retried) ((void)0) #endif #endif /* _KERNEL */ |