diff options
| author | Justin T. Gibbs <[email protected]> | 2015-04-02 14:44:32 +1100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-04-28 16:25:34 -0700 |
| commit | 0c66c32d1d8b64a261cceb5f50a9e86777c5d0b2 (patch) | |
| tree | 82f5630e8a4e77931e9992db3a7fac1964414716 /module/zfs/zfs_sa.c | |
| parent | d683ddbb7272a179da3918cc4f922d92a2195ba2 (diff) | |
Illumos 5056 - ZFS deadlock on db_mtx and dn_holds
5056 ZFS deadlock on db_mtx and dn_holds
Author: Justin Gibbs <[email protected]>
Reviewed by: Will Andrews <[email protected]>
Reviewed by: Matt Ahrens <[email protected]>
Reviewed by: George Wilson <[email protected]>
Approved by: Dan McDonald <[email protected]>
References:
https://www.illumos.org/issues/5056
https://github.com/illumos/illumos-gate/commit/bc9014e
Porting Notes:
sa_handle_get_from_db():
- the original patch includes an otherwise unmentioned fix for a
possible usage of an uninitialised variable
dmu_objset_open_impl():
- Under Illumos list_link_init() is the same as filling a list_node_t
with NULLs, so they don't notice if they miss doing list_link_init()
on a zero'd containing structure (e.g. allocated with kmem_zalloc as
here). Under Linux, not so much: an uninitialised list_node_t goes
"Boom!" some time later when it's used or destroyed.
dmu_objset_evict_dbufs():
- reduce stack usage using kmem_alloc()
Ported-by: Chris Dunlop <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'module/zfs/zfs_sa.c')
| -rw-r--r-- | module/zfs/zfs_sa.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/module/zfs/zfs_sa.c b/module/zfs/zfs_sa.c index 257ab4254..c9a9da752 100644 --- a/module/zfs/zfs_sa.c +++ b/module/zfs/zfs_sa.c @@ -22,8 +22,7 @@ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. */ -#include <sys/types.h> -#include <sys/param.h> +#include <sys/zfs_context.h> #include <sys/vnode.h> #include <sys/sa.h> #include <sys/zfs_acl.h> |