Module Name: src Committed By: riz Date: Wed Mar 9 23:49:07 UTC 2011
Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: spa_config.c Log Message: If the config is zero size, don't try to read it. OK haad@ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c:1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c:1.4 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c:1.3 Sat Feb 27 23:43:53 2010 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c Wed Mar 9 23:49:06 2011 @@ -95,6 +95,9 @@ if (kobj_get_filesize(file, &fsize) != 0) goto out; + if (fsize == 0) + goto out; + buf = kmem_alloc(fsize, KM_SLEEP); /*