From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 3/4] filetype: Use cdev_open
Date: Tue, 13 Oct 2015 09:51:53 +0200 [thread overview]
Message-ID: <1444722714-30445-4-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1444722714-30445-1-git-send-email-s.hauer@pengutronix.de>
a cdev has to be opened before usage. Use cdev_open instead of
cdev_by_name.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/filetype.c | 4 +++-
fs/fs.c | 2 --
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/filetype.c b/common/filetype.c
index dc2ff3f..9ec8ebf 100644
--- a/common/filetype.c
+++ b/common/filetype.c
@@ -369,9 +369,10 @@ enum filetype cdev_detect_type(const char *name)
struct cdev *cdev;
void *buf;
- cdev = cdev_by_name(name);
+ cdev = cdev_open(name, O_RDONLY);
if (!cdev)
return type;
+
buf = xzalloc(FILE_TYPE_SAFE_BUFSIZE);
ret = cdev_read(cdev, buf, FILE_TYPE_SAFE_BUFSIZE, 0, 0);
if (ret < 0)
@@ -396,5 +397,6 @@ enum filetype cdev_detect_type(const char *name)
err_out:
free(buf);
+ cdev_close(cdev);
return type;
}
diff --git a/fs/fs.c b/fs/fs.c
index c2a20e1..2d7578b 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -1205,8 +1205,6 @@ static const char *detect_fs(const char *filename)
struct driver_d *drv;
struct fs_driver_d *fdrv;
- if (!strncmp(filename, "/dev/", 5))
- filename += 5;
type = cdev_detect_type(filename);
if (type == filetype_unknown)
--
2.6.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2015-10-13 7:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-13 7:51 devfs fixes Sascha Hauer
2015-10-13 7:51 ` [PATCH 1/4] fs: devfs: Allow mounting only on /dev/ Sascha Hauer
2015-10-13 7:51 ` [PATCH 2/4] fs: devfs: Allow mount path in cdev_open Sascha Hauer
2015-10-13 8:25 ` Sascha Hauer
2015-10-13 7:51 ` Sascha Hauer [this message]
2015-10-13 7:51 ` [PATCH 4/4] fs: pass path directly to cdev_open 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=1444722714-30445-4-git-send-email-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