From: ASOU Masato Subject: tweak softraid_crypto.c To: tech@openbsd.org Cc: yasuoka@openbsd.org Date: Wed, 11 Mar 2026 11:27:53 +0900 Hi, Tweak sr_crypto_create_key_disk() to match sr_crypto_read_key_disk(). comment, ok? -- ASOU Masato Index: softraid_crypto.c =================================================================== RCS file: /cvs/src/sys/dev/softraid_crypto.c,v diff -u -p -r1.147 softraid_crypto.c --- softraid_crypto.c 17 Feb 2026 04:51:47 -0000 1.147 +++ softraid_crypto.c 11 Mar 2026 02:20:53 -0000 @@ -696,7 +696,6 @@ sr_crypto_create_key_disk(struct sr_disc km = &key_disk->src_meta; key_disk->src_dev_mm = dev; - key_disk->src_vn = vn; strlcpy(key_disk->src_devname, devname, sizeof(km->scmi.scm_devname)); key_disk->src_size = 0; @@ -779,6 +778,7 @@ fail: free(key_disk, M_DEVBUF, sizeof(struct sr_chunk)); key_disk = NULL; + /* keep `open = 1' to close dev */ done: free(label, M_DEVBUF, sizeof(*label)); free(omi, M_DEVBUF, sizeof(struct sr_meta_opt_item)); @@ -910,7 +910,7 @@ done: free(label, M_DEVBUF, sizeof(*label)); free(sm, M_DEVBUF, SR_META_SIZE * DEV_BSIZE); - if (vn && open) { + if (open) { VOP_CLOSE(vn, FREAD, NOCRED, curproc); vput(vn); }