mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 05/10] fs: efivar: move variable discovery into probe
Date: Tue,  4 Nov 2014 10:42:51 +0100	[thread overview]
Message-ID: <1415094176-26435-5-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1415094176-26435-1-git-send-email-l.stach@pengutronix.de>

So we can manipulate things easier.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 fs/efivarfs.c | 109 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 58 insertions(+), 51 deletions(-)

diff --git a/fs/efivarfs.c b/fs/efivarfs.c
index fda5d7449e4f..aa66aa8dd99d 100644
--- a/fs/efivarfs.c
+++ b/fs/efivarfs.c
@@ -34,9 +34,18 @@
 #include <mach/efi.h>
 #include <mach/efi-device.h>
 
+struct efivarfs_inode {
+	char *name;
+	struct list_head node;
+};
+
+struct efivarfs_dir {
+	struct list_head *current;
+	DIR dir;
+};
+
 struct efivarfs_priv {
-	struct efi_file_handle *root_dir;
-	struct efi_file_io_interface *protocol;
+	struct list_head inodes;
 };
 
 static int char_to_nibble(char c)
@@ -194,64 +203,29 @@ static loff_t efivarfs_lseek(struct device_d *dev, FILE *f, loff_t pos)
 	return f->pos;
 }
 
-struct efivarfs_dir_entry {
-	char *name;
-	struct list_head node;
-};
-
-struct efivarfs_dir {
-	struct list_head entries;
-	struct list_head *current;
-	DIR dir;
-};
-
 static DIR *efivarfs_opendir(struct device_d *dev, const char *pathname)
 {
-	efi_status_t efiret;
-	efi_guid_t vendor;
-	s16 name[1024];
+	struct efivarfs_priv *priv = dev->priv;
 	struct efivarfs_dir *edir;
-	unsigned long size;
-	unsigned char *name8;
-
-	name[0] = 0;
 
 	edir = xzalloc(sizeof(*edir));
-	INIT_LIST_HEAD(&edir->entries);
-
-	while (1) {
-		struct efivarfs_dir_entry *entry;
-
-		size = sizeof(name);
-		efiret = RT->get_next_variable(&size, name, &vendor);
-		if (EFI_ERROR(efiret))
-			break;
-
-		entry = xzalloc(sizeof(*entry));
-		name8 = strdup_wchar_to_char(name);
-
-		entry->name = asprintf("%s-%pUl", name8, &vendor);
-		free(name8);
-
-		list_add_tail(&entry->node, &edir->entries);
-	}
-
-	edir->current = edir->entries.next;
+	edir->current = priv->inodes.next;
 
 	return &edir->dir;
 }
 
 static struct dirent *efivarfs_readdir(struct device_d *dev, DIR *dir)
 {
+	struct efivarfs_priv *priv = dev->priv;
 	struct efivarfs_dir *edir = container_of(dir, struct efivarfs_dir, dir);
-	struct efivarfs_dir_entry *entry;
+	struct efivarfs_inode *inode;
 
-	if (edir->current == &edir->entries)
+	if (edir->current == &priv->inodes)
 		return NULL;
 
-	entry = list_entry(edir->current, struct efivarfs_dir_entry, node);
+	inode = list_entry(edir->current, struct efivarfs_inode, node);
 
-	strcpy(dir->d.d_name, entry->name);
+	strcpy(dir->d.d_name, inode->name);
 
 	edir->current = edir->current->next;
 
@@ -261,12 +235,6 @@ static struct dirent *efivarfs_readdir(struct device_d *dev, DIR *dir)
 static int efivarfs_closedir(struct device_d *dev, DIR *dir)
 {
 	struct efivarfs_dir *edir = container_of(dir, struct efivarfs_dir, dir);
-	struct efivarfs_dir_entry *entry, *tmp;
-
-	list_for_each_entry_safe(entry, tmp, &edir->entries, node) {
-		free(entry->name);
-		free(entry);
-	}
 
 	free(edir);
 
@@ -300,12 +268,51 @@ static int efivarfs_stat(struct device_d *dev, const char *filename, struct stat
 
 static int efivarfs_probe(struct device_d *dev)
 {
+	efi_status_t efiret;
+	efi_guid_t vendor;
+	s16 name[1024];
+	unsigned long size;
+	unsigned char *name8;
+	struct efivarfs_priv *priv;
+
+	name[0] = 0;
+
+	priv = xzalloc(sizeof(*priv));
+	INIT_LIST_HEAD(&priv->inodes);
+
+	while (1) {
+		struct efivarfs_inode *inode;
+
+		size = sizeof(name);
+		efiret = RT->get_next_variable(&size, name, &vendor);
+		if (EFI_ERROR(efiret))
+			break;
+
+		inode = xzalloc(sizeof(*inode));
+		name8 = strdup_wchar_to_char(name);
+
+		inode->name = asprintf("%s-%pUl", name8, &vendor);
+		free(name8);
+
+		list_add_tail(&inode->node, &priv->inodes);
+	}
+
+	dev->priv = priv;
+
 	return 0;
 }
 
 static void efivarfs_remove(struct device_d *dev)
 {
-	free(dev->priv);
+	struct efivarfs_priv *priv = dev->priv;
+	struct efivarfs_inode *inode, *tmp;
+
+	list_for_each_entry_safe(inode, tmp, &priv->inodes, node) {
+		free(inode->name);
+		free(inode);
+	}
+
+	free(priv);
 }
 
 static struct fs_driver_d efivarfs_driver = {
-- 
2.1.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2014-11-04  9:43 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-04  9:42 [PATCH 01/10] efi: add proper reset hook Lucas Stach
2014-11-04  9:42 ` [PATCH 02/10] efi: add Barebox GUID Lucas Stach
2014-11-05  7:21   ` Sascha Hauer
2014-11-05  9:03     ` Lucas Stach
2014-11-04  9:42 ` [PATCH 03/10] fs: efivar: cosmetic changes Lucas Stach
2014-11-04  9:42 ` [PATCH 04/10] fs: efivar: switch to standard list implementation Lucas Stach
2014-11-04  9:42 ` Lucas Stach [this message]
2014-11-04  9:42 ` [PATCH 06/10] lib: add wchar strdup Lucas Stach
2014-11-04  9:42 ` [PATCH 07/10] fs: efivar: preserve more info in inode Lucas Stach
2014-11-04  9:42 ` [PATCH 08/10] fs: efivar: don't store attributes in file Lucas Stach
2014-11-04  9:42 ` [PATCH 09/10] fs: efivar: implement write support Lucas Stach
2014-11-04  9:42 ` [PATCH 10/10] efi: mount efivarfs by default if enabled Lucas Stach
2014-11-05  7:21 ` [PATCH 01/10] efi: add proper reset hook Sascha Hauer
2014-11-05  9:00   ` Lucas Stach

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=1415094176-26435-5-git-send-email-l.stach@pengutronix.de \
    --to=l.stach@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