diff options
| author | Sebastien Roy <seb@delphix.com> | 2017-04-27 22:46:23 -0700 |
|---|---|---|
| committer | Prakash Surya <prakash.surya@delphix.com> | 2017-05-16 02:07:25 -0700 |
| commit | ade42b557a6e29c3d17a61b1535d99af10e379be (patch) | |
| tree | d78d4019b4d8ff987fb90f8c24ad8e135624b6ea /usr/src/uts/common/fs/dev/sdev_subr.c | |
| parent | fe4627ef755b7c263f91a0e6f07cdca5d7083501 (diff) | |
| download | illumos-joyent-ade42b557a6e29c3d17a61b1535d99af10e379be.tar.gz | |
8064 need a static DTrace probe in VN_HOLD
Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Prashanth Sreenivasa <pks@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/uts/common/fs/dev/sdev_subr.c')
| -rw-r--r-- | usr/src/uts/common/fs/dev/sdev_subr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/uts/common/fs/dev/sdev_subr.c b/usr/src/uts/common/fs/dev/sdev_subr.c index 9234cc4a0c..d810dd9a31 100644 --- a/usr/src/uts/common/fs/dev/sdev_subr.c +++ b/usr/src/uts/common/fs/dev/sdev_subr.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2016 Joyent, Inc. All rights reserved. + * Copyright (c) 2017 by Delphix. All rights reserved. */ /* @@ -2810,8 +2811,8 @@ checkforroot: } int -sdev_modctl_readdir(const char *dir, char ***dirlistp, - int *npathsp, int *npathsp_alloc, int checking_empty) +sdev_modctl_readdir(const char *dir, char ***dirlistp, int *npathsp, + int *npathsp_alloc, int checking_empty) { char **pathlist = NULL; char **newlist = NULL; @@ -3132,12 +3133,12 @@ devname_inactive_func(struct vnode *vp, struct cred *cred, } VERIFY(dv->sdev_nlink == 1); decr_link(dv); - --vp->v_count; + VN_RELE_LOCKED(vp); rw_exit(&dv->sdev_contents); mutex_exit(&vp->v_lock); sdev_nodedestroy(dv, 0); } else { - --vp->v_count; + VN_RELE_LOCKED(vp); rw_exit(&dv->sdev_contents); mutex_exit(&vp->v_lock); } |