mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 7/7] bootm: use cdev_open_by_name()
Date: Thu, 16 May 2024 09:08:22 +0200	[thread overview]
Message-ID: <20240516070822.2746845-8-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20240516070822.2746845-1-s.hauer@pengutronix.de>

cdev_by_name() returns a cdev without increasing its reference count. In
order to maintain a proper reference counting use cdev_open_by_name()
instead and make sure it's closed afterwards when no longer needed.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/bootm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/bootm.c b/common/bootm.c
index c851ab0456..357537c54e 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -760,7 +760,7 @@ int bootm_boot(struct bootm_data *bootm_data)
 
 		if (bootm_data->root_dev) {
 			const char *root_dev_name = devpath_to_name(bootm_data->root_dev);
-			const struct cdev *root_cdev = cdev_by_name(root_dev_name);
+			struct cdev *root_cdev = cdev_open_by_name(root_dev_name, O_RDONLY);
 
 			rootarg = cdev_get_linux_rootarg(root_cdev);
 			if (!rootarg) {
@@ -773,6 +773,9 @@ int bootm_boot(struct bootm_data *bootm_data)
 					pr_err("%s doesn't have a PARTUUID, cannot set root= option\n",
 						root_dev_name);
 			}
+
+			if (root_cdev)
+				cdev_close(root_cdev);
 		} else {
 			rootarg = path_get_linux_rootarg(data->os_file);
 		}
-- 
2.39.2




  parent reply	other threads:[~2024-05-16  7:09 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-16  7:08 [PATCH 0/7] replace cdev_by_name() with cdev_open_by_name() Sascha Hauer
2024-05-16  7:08 ` [PATCH 1/7] ARM: Freescale i.MX23 evk: use cdev_open_by_name() Sascha Hauer
2024-05-16  7:08 ` [PATCH 2/7] ARM: tx28: " Sascha Hauer
2024-05-16  7:08 ` [PATCH 3/7] ARM: omap: " Sascha Hauer
2024-05-16  7:08 ` [PATCH 4/7] ARM: Rockchip: " Sascha Hauer
2024-05-16  7:08 ` [PATCH 5/7] commands: devlookup: " Sascha Hauer
2024-05-16  7:08 ` [PATCH 6/7] commands: findmnt: " Sascha Hauer
2024-05-16  7:08 ` Sascha Hauer [this message]
2024-05-16 14:43 ` [PATCH 0/7] replace cdev_by_name() with cdev_open_by_name() Marco Felsch
2024-05-16 15:01   ` Sascha Hauer
2024-05-21  6:17 ` Sascha Hauer

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=20240516070822.2746845-8-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox