* [PATCH v1] fixup! detect_fs: use device instead of file
@ 2015-10-12 13:15 Peter Mamonov
2015-10-13 7:44 ` Sascha Hauer
0 siblings, 1 reply; 4+ messages in thread
From: Peter Mamonov @ 2015-10-12 13:15 UTC (permalink / raw)
To: barebox; +Cc: Peter Mamonov
---
fs/fs.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/fs/fs.c b/fs/fs.c
index c041e41..c2a20e1 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -1201,10 +1201,14 @@ EXPORT_SYMBOL(register_fs_driver);
static const char *detect_fs(const char *filename)
{
- enum filetype type = cdev_detect_type(filename);
+ enum filetype type;
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)
return NULL;
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v1] fixup! detect_fs: use device instead of file
2015-10-12 13:15 [PATCH v1] fixup! detect_fs: use device instead of file Peter Mamonov
@ 2015-10-13 7:44 ` Sascha Hauer
2015-10-13 11:26 ` [PATCH v1 resend] " Peter Mamonov
0 siblings, 1 reply; 4+ messages in thread
From: Sascha Hauer @ 2015-10-13 7:44 UTC (permalink / raw)
To: Peter Mamonov; +Cc: barebox
Hi Peter,
I was about to apply this one, but there are two problems with it.
First I cannot apply this as a fixup patch since the patch breaking it
is already in master which I do not rebase. So we need a patch with a
proper commit message. I would add that myself, but I noticed that your
patch misses a proper signed-off-by. Could you add that and resend?
Sascha
On Mon, Oct 12, 2015 at 04:15:17PM +0300, Peter Mamonov wrote:
> ---
> fs/fs.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/fs/fs.c b/fs/fs.c
> index c041e41..c2a20e1 100644
> --- a/fs/fs.c
> +++ b/fs/fs.c
> @@ -1201,10 +1201,14 @@ EXPORT_SYMBOL(register_fs_driver);
>
> static const char *detect_fs(const char *filename)
> {
> - enum filetype type = cdev_detect_type(filename);
> + enum filetype type;
> 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)
> return NULL;
>
> --
> 2.1.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v1 resend] fixup! detect_fs: use device instead of file
2015-10-13 7:44 ` Sascha Hauer
@ 2015-10-13 11:26 ` Peter Mamonov
2015-10-13 14:09 ` Sascha Hauer
0 siblings, 1 reply; 4+ messages in thread
From: Peter Mamonov @ 2015-10-13 11:26 UTC (permalink / raw)
To: s.hauer, barebox; +Cc: Peter Mamonov
Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
---
fs/fs.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/fs/fs.c b/fs/fs.c
index c041e41..c2a20e1 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -1201,10 +1201,14 @@ EXPORT_SYMBOL(register_fs_driver);
static const char *detect_fs(const char *filename)
{
- enum filetype type = cdev_detect_type(filename);
+ enum filetype type;
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)
return NULL;
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v1 resend] fixup! detect_fs: use device instead of file
2015-10-13 11:26 ` [PATCH v1 resend] " Peter Mamonov
@ 2015-10-13 14:09 ` Sascha Hauer
0 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2015-10-13 14:09 UTC (permalink / raw)
To: Peter Mamonov; +Cc: barebox
On Tue, Oct 13, 2015 at 02:26:23PM +0300, Peter Mamonov wrote:
> Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
> ---
> fs/fs.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
Applied, thanks
Sascha
>
> diff --git a/fs/fs.c b/fs/fs.c
> index c041e41..c2a20e1 100644
> --- a/fs/fs.c
> +++ b/fs/fs.c
> @@ -1201,10 +1201,14 @@ EXPORT_SYMBOL(register_fs_driver);
>
> static const char *detect_fs(const char *filename)
> {
> - enum filetype type = cdev_detect_type(filename);
> + enum filetype type;
> 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)
> return NULL;
>
> --
> 2.1.4
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-10-13 14:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-12 13:15 [PATCH v1] fixup! detect_fs: use device instead of file Peter Mamonov
2015-10-13 7:44 ` Sascha Hauer
2015-10-13 11:26 ` [PATCH v1 resend] " Peter Mamonov
2015-10-13 14:09 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox