d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

g_eli_create: only dec g_access acw if we inc'd it

Browse Source 
Reviewed by:	cem, markj
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D20743
This commit is contained in:
Ryan Libby 2019-07-01 22:06:16 +00:00
parent b6ce9ba9c3
commit 3bb6e0f0c7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=349586
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/geom/eli/g_eli.c
View File

@ -827,7 +827,7 @@ g_eli_create(struct gctl_req *req, struct g_class *mp, struct g_provider *bpp,
struct g_provider *pp;
struct g_consumer *cp;
u_int i, threads;
int error;
int dcw, error;
G_ELI_DEBUG(1, "Creating device %s%s.", bpp->name, G_ELI_SUFFIX);
@ -881,10 +881,8 @@ g_eli_create(struct gctl_req *req, struct g_class *mp, struct g_provider *bpp,
* We don't open provider for writing only when user requested read-only
* access.
*/
if (sc->sc_flags & G_ELI_FLAG_RO)
error = g_access(cp, 1, 0, 1);
else
error = g_access(cp, 1, 1, 1);
dcw = (sc->sc_flags & G_ELI_FLAG_RO) ? 0 : 1;
error = g_access(cp, 1, dcw, 1);
if (error != 0) {
if (req != NULL) {
gctl_error(req, "Cannot access %s (error=%d).",
@ -996,7 +994,7 @@ g_eli_create(struct gctl_req *req, struct g_class *mp, struct g_provider *bpp,
mtx_destroy(&sc->sc_queue_mtx);
if (cp->provider != NULL) {
if (cp->acr == 1)
g_access(cp, -1, -1, -1);
g_access(cp, -1, -dcw, -1);
g_detach(cp);
}
g_destroy_consumer(cp);