equal
deleted
inserted
replaced
18 * information: Portions Copyright [yyyy] [name of copyright owner] |
18 * information: Portions Copyright [yyyy] [name of copyright owner] |
19 * |
19 * |
20 * CDDL HEADER END |
20 * CDDL HEADER END |
21 */ |
21 */ |
22 /* |
22 /* |
23 * Copyright 2005 Sun Microsystems, Inc. All rights reserved. |
23 * Copyright 2006 Sun Microsystems, Inc. All rights reserved. |
24 * Use is subject to license terms. |
24 * Use is subject to license terms. |
25 */ |
25 */ |
26 |
26 |
27 #pragma ident "%Z%%M% %I% %E% SMI" |
27 #pragma ident "%Z%%M% %I% %E% SMI" |
28 |
28 |
317 { |
317 { |
318 int i; |
318 int i; |
319 |
319 |
320 if (blocksize == 0) |
320 if (blocksize == 0) |
321 blocksize = 1 << zfs_default_bs; |
321 blocksize = 1 << zfs_default_bs; |
322 |
322 else if (blocksize > SPA_MAXBLOCKSIZE) |
323 blocksize = MIN(MAX(blocksize, SPA_MINBLOCKSIZE), SPA_MAXBLOCKSIZE); |
323 blocksize = SPA_MAXBLOCKSIZE; |
|
324 else |
|
325 blocksize = P2ROUNDUP(blocksize, SPA_MINBLOCKSIZE); |
324 |
326 |
325 if (ibs == 0) |
327 if (ibs == 0) |
326 ibs = zfs_default_ibs; |
328 ibs = zfs_default_ibs; |
327 |
329 |
328 ibs = MIN(MAX(ibs, DN_MIN_INDBLKSHIFT), DN_MAX_INDBLKSHIFT); |
330 ibs = MIN(MAX(ibs, DN_MIN_INDBLKSHIFT), DN_MAX_INDBLKSHIFT); |