[PATCH 1/4] fs/mount: add autodetection type support
Jean-Christophe PLAGNIOL-VILLARD
plagnioj at jcrosoft.com
Sun Aug 12 07:49:36 EDT 2012
if NULL is pass as type mount will try to autodetect the filesystem type
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
fs/Kconfig | 5 +++++
fs/fs.c | 28 ++++++++++++++++++++++++++++
include/fs.h | 5 +++++
3 files changed, 38 insertions(+)
diff --git a/fs/Kconfig b/fs/Kconfig
index b75820f..4c66543 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1,6 +1,11 @@
menu "Filesystem support "
+config FS
+ bool
+ default y
+ select FILETYPE
+
config FS_AUTOMOUNT
bool
diff --git a/fs/fs.c b/fs/fs.c
index 0b376a5..7126577 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -954,6 +954,28 @@ int register_fs_driver(struct fs_driver_d *fsdrv)
}
EXPORT_SYMBOL(register_fs_driver);
+static const char * detect_fs(const char *filename)
+{
+ enum filetype type = file_name_detect_type(filename);
+ struct driver_d *drv;
+ struct fs_driver_d *fdrv;
+
+ if (type == filetype_unknown)
+ return NULL;
+
+ for_each_driver(drv) {
+ fdrv = drv_to_fs_driver(drv);
+
+ if (drv->bus != &fs_bus)
+ continue;
+
+ if(type == fdrv->type)
+ return drv->name;
+ }
+
+ return NULL;
+}
+
/*
* Mount a device to a directory.
* We do this by registering a new device on which the filesystem
@@ -985,6 +1007,12 @@ int mount(const char *device, const char *fsname, const char *_path)
}
}
+ if (!fsname)
+ fsname = detect_fs(device);
+
+ if (!fsname)
+ return -ENOENT;
+
fsdev = xzalloc(sizeof(struct fs_device_d));
fsdev->backingstore = xstrdup(device);
safe_strncpy(fsdev->dev.name, fsname, MAX_DRIVER_NAME);
diff --git a/include/fs.h b/include/fs.h
index c0b9f71..22470e6 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -2,6 +2,7 @@
#define __FS_H
#include <driver.h>
+#include <filetype.h>
#define PATH_MAX 1024 /* include/linux/limits.h */
@@ -72,6 +73,8 @@ struct fs_driver_d {
struct driver_d drv;
+ enum filetype type;
+
unsigned long flags;
};
@@ -93,6 +96,8 @@ struct fs_device_d {
struct list_head list;
};
+#define drv_to_fs_driver(d) container_of(d, struct fs_driver_d, drv)
+
/*
* standard posix file functions
*/
--
1.7.10.4
More information about the barebox
mailing list