git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebase master to b117
[zfs.git]
/
module
/
zcommon
/
zprop_common.c
diff --git
a/module/zcommon/zprop_common.c
b/module/zcommon/zprop_common.c
index
bd267e2
..
85f55c2
100644
(file)
--- a/
module/zcommon/zprop_common.c
+++ b/
module/zcommon/zprop_common.c
@@
-19,12
+19,10
@@
* CDDL HEADER END
*/
/*
* CDDL HEADER END
*/
/*
- * Copyright 200
8
Sun Microsystems, Inc. All rights reserved.
+ * Copyright 200
9
Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* Common routines used by zfs and zpool property management.
*/
/*
* Common routines used by zfs and zpool property management.
*/
@@
-205,9
+203,6
@@
propname_match(const char *p, size_t len, zprop_desc_t *prop_entry)
#ifndef _KERNEL
const char *colname = prop_entry->pd_colname;
int c;
#ifndef _KERNEL
const char *colname = prop_entry->pd_colname;
int c;
-
- if (colname == NULL)
- return (B_FALSE);
#endif
if (len == strlen(propname) &&
#endif
if (len == strlen(propname) &&
@@
-215,7
+210,7
@@
propname_match(const char *p, size_t len, zprop_desc_t *prop_entry)
return (B_TRUE);
#ifndef _KERNEL
return (B_TRUE);
#ifndef _KERNEL
- if (len != strlen(colname))
+ if (
colname == NULL ||
len != strlen(colname))
return (B_FALSE);
for (c = 0; c < len; c++)
return (B_FALSE);
for (c = 0; c < len; c++)