diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-08-02 06:49:16 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-08-02 06:49:16 +0000 |
| commit | 17e352b011acdda69718763c44d9197645c43877 (patch) | |
| tree | 9497f616b95ab66188bdbcba0a3c257335df2c60 /uts/common | |
| parent | f0315c58e99f3070a6a1cab2c69e076611e7a1c7 (diff) | |
| download | src-17e352b011acdda69718763c44d9197645c43877.tar.gz src-17e352b011acdda69718763c44d9197645c43877.zip | |
Author: Justin T. Gibbs <justing@spectralogic.com>
Date: Fri Aug 1 17:55:38 2014 -0800
5038 Remove "old-style" flexible array usage in ZFS.
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Approved by: Richard Lowe <richlowe@richlowe.net>
illumos/illumos-gate@7f18da4c54210b682e105b0e7be5195c60f98d20
Notes
Notes:
svn path=/vendor-sys/illumos/dist/; revision=269427
Diffstat (limited to 'uts/common')
| -rw-r--r-- | uts/common/fs/zfs/dnode.c | 6 | ||||
| -rw-r--r-- | uts/common/fs/zfs/sys/dnode.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/uts/common/fs/zfs/dnode.c b/uts/common/fs/zfs/dnode.c index 1eadb4f6954d..f5f5c4016313 100644 --- a/uts/common/fs/zfs/dnode.c +++ b/uts/common/fs/zfs/dnode.c @@ -1021,7 +1021,7 @@ dnode_buf_pageout(dmu_buf_t *db, void *arg) dnh->dnh_dnode = NULL; } kmem_free(children_dnodes, sizeof (dnode_children_t) + - (epb - 1) * sizeof (dnode_handle_t)); + epb * sizeof (dnode_handle_t)); } /* @@ -1106,7 +1106,7 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag, int i; dnode_children_t *winner; children_dnodes = kmem_alloc(sizeof (dnode_children_t) + - (epb - 1) * sizeof (dnode_handle_t), KM_SLEEP); + epb * sizeof (dnode_handle_t), KM_SLEEP); children_dnodes->dnc_count = epb; dnh = &children_dnodes->dnc_children[0]; for (i = 0; i < epb; i++) { @@ -1121,7 +1121,7 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag, } kmem_free(children_dnodes, sizeof (dnode_children_t) + - (epb - 1) * sizeof (dnode_handle_t)); + epb * sizeof (dnode_handle_t)); children_dnodes = winner; } } diff --git a/uts/common/fs/zfs/sys/dnode.h b/uts/common/fs/zfs/sys/dnode.h index 7923a34a82bb..6e4a845a36a1 100644 --- a/uts/common/fs/zfs/sys/dnode.h +++ b/uts/common/fs/zfs/sys/dnode.h @@ -245,7 +245,7 @@ typedef struct dnode_handle { typedef struct dnode_children { size_t dnc_count; /* number of children */ - dnode_handle_t dnc_children[1]; /* sized dynamically */ + dnode_handle_t dnc_children[]; /* sized dynamically */ } dnode_children_t; typedef struct free_range { |