From: cel@kernel.org
To: Trond Myklebust <trond.myklebust@hammerspace.com>,
Anna Schumaker <anna@kernel.org>
Cc: Ben Coddington <bcodding@redhat.com>, <linux-nfs@vger.kernel.org>,
Chuck Lever <chuck.lever@oracle.com>
Subject: [PATCH] nfs/blocklayout: fput() needed for ENODEV error flow
Date: Wed, 19 Jun 2024 09:52:56 -0400 [thread overview]
Message-ID: <20240619135255.176454-2-cel@kernel.org> (raw)
From: Chuck Lever <chuck.lever@oracle.com>
A recently-added error flow needs to fput() the block device just
like the other error flows in this area; otherwise the device is
leaked.
Fixes: d76c769c8db4 ("pnfs/blocklayout: Don't add zero-length pnfs_block_dev")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
fs/nfs/blocklayout/dev.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/blocklayout/dev.c b/fs/nfs/blocklayout/dev.c
index 93ef7f864980..519c310c745d 100644
--- a/fs/nfs/blocklayout/dev.c
+++ b/fs/nfs/blocklayout/dev.c
@@ -351,8 +351,10 @@ bl_parse_scsi(struct nfs_server *server, struct pnfs_block_dev *d,
d->map = bl_map_simple;
d->pr_key = v->scsi.pr_key;
- if (d->len == 0)
- return -ENODEV;
+ if (d->len == 0) {
+ error = -ENODEV;
+ goto out_blkdev_put;
+ }
pr_info("pNFS: using block device %s (reservation key 0x%llx)\n",
file_bdev(d->bdev_file)->bd_disk->disk_name, d->pr_key);
--
2.45.1
next reply other threads:[~2024-06-19 13:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-19 13:52 cel [this message]
2024-06-20 5:21 ` [PATCH] nfs/blocklayout: fput() needed for ENODEV error flow Christoph Hellwig
2024-06-20 9:34 ` Sagi Grimberg
2024-06-20 11:32 ` Benjamin Coddington
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240619135255.176454-2-cel@kernel.org \
--to=cel@kernel.org \
--cc=anna@kernel.org \
--cc=bcodding@redhat.com \
--cc=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.