diff options
| author |   jsing <jsing@openbsd.org> | 2016-05-21 14:19:03 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2016-05-21 14:19:03 +0000 |
| commit | 7afb22b7caff81f8aba1eaba93abd6b087bca315 (patch) | |
| tree | 641df2740bc0fbb2bbce04cdf7e73ecba354928f | |
| parent | Cleanup some of the DUID code and refactor for readability. (diff) | |
| download | wireguard-openbsd-7afb22b7caff81f8aba1eaba93abd6b087bca315.tar.xz wireguard-openbsd-7afb22b7caff81f8aba1eaba93abd6b087bca315.zip | |
Remove another erroneous VOP_CLOSE/vput, which was missed with the last
commit. While here, also be consistent with the goto labels used.
| -rw-r--r-- | sys/dev/softraid_crypto.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c index 2dc2ab6f2ee..45782b8227c 100644 --- a/sys/dev/softraid_crypto.c +++ b/sys/dev/softraid_crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_crypto.c,v 1.127 2016/05/17 19:28:59 tedu Exp $ */ +/* $OpenBSD: softraid_crypto.c,v 1.128 2016/05/21 14:19:03 jsing Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org> @@ -636,7 +636,7 @@ sr_crypto_create_key_disk(struct sr_discipline *sd, dev_t dev) DNPRINTF(SR_D_META,"%s: sr_crypto_create_key_disk cannot " "open %s\n", DEVNAME(sc), devname); vput(vn); - goto fail; + goto done; } open = 1; /* close dev on error */ @@ -646,12 +646,12 @@ sr_crypto_create_key_disk(struct sr_discipline *sd, dev_t dev) FREAD, NOCRED, curproc)) { DNPRINTF(SR_D_META, "%s: sr_crypto_create_key_disk ioctl " "failed\n", DEVNAME(sc)); - goto fail; + goto done; } if (label.d_partitions[part].p_fstype != FS_RAID) { sr_error(sc, "%s partition not of type RAID (%d)", devname, label.d_partitions[part].p_fstype); - goto fail; + goto done; } /* @@ -809,8 +809,6 @@ sr_crypto_read_key_disk(struct sr_discipline *sd, dev_t dev) NOCRED, curproc)) { DNPRINTF(SR_D_META, "%s: sr_crypto_read_key_disk ioctl " "failed\n", DEVNAME(sc)); - VOP_CLOSE(vn, FREAD | FWRITE, NOCRED, curproc); - vput(vn); goto done; } if (label.d_partitions[part].p_fstype != FS_RAID) { |