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 09/12] fs: efivar: preserve more info in inode
Date: Mon,  8 Dec 2014 14:42:36 +0100	[thread overview]
Message-ID: <1418046159-29843-9-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1418046159-29843-1-git-send-email-l.stach@pengutronix.de>

Preserve info needed for easy manipulation of variables.

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

diff --git a/fs/efivarfs.c b/fs/efivarfs.c
index aa66aa8dd99d..a36020d2d08e 100644
--- a/fs/efivarfs.c
+++ b/fs/efivarfs.c
@@ -35,7 +35,9 @@
 #include <mach/efi-device.h>
 
 struct efivarfs_inode {
-	char *name;
+	s16 *name;
+	efi_guid_t vendor;
+	char *full_name; /* name including vendor namespacing */
 	struct list_head node;
 };
 
@@ -225,7 +227,7 @@ static struct dirent *efivarfs_readdir(struct device_d *dev, DIR *dir)
 
 	inode = list_entry(edir->current, struct efivarfs_inode, node);
 
-	strcpy(dir->d.d_name, inode->name);
+	strcpy(dir->d.d_name, inode->full_name);
 
 	edir->current = edir->current->next;
 
@@ -271,8 +273,8 @@ static int efivarfs_probe(struct device_d *dev)
 	efi_status_t efiret;
 	efi_guid_t vendor;
 	s16 name[1024];
+	char *name8;
 	unsigned long size;
-	unsigned char *name8;
 	struct efivarfs_priv *priv;
 
 	name[0] = 0;
@@ -289,9 +291,12 @@ static int efivarfs_probe(struct device_d *dev)
 			break;
 
 		inode = xzalloc(sizeof(*inode));
-		name8 = strdup_wchar_to_char(name);
+		inode->name = strdup_wchar(name);
+
+		inode->vendor = vendor;
 
-		inode->name = asprintf("%s-%pUl", name8, &vendor);
+		name8 = strdup_wchar_to_char(inode->name);
+		inode->full_name = asprintf("%s-%pUl", name8, &vendor);
 		free(name8);
 
 		list_add_tail(&inode->node, &priv->inodes);
-- 
2.1.3


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

  parent reply	other threads:[~2014-12-08 13:43 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-08 13:42 [PATCH 01/12] efi: add function to determine type of device path Lucas Stach
2014-12-08 13:42 ` [PATCH 02/12] efi: add proper reset hook Lucas Stach
2014-12-08 13:42 ` [PATCH 03/12] efi: move exit to EFI into own command Lucas Stach
2014-12-08 13:42 ` [PATCH 04/12] efi: add Barebox GUID Lucas Stach
2014-12-08 13:42 ` [PATCH 05/12] fs: efivars: cosmetic changes Lucas Stach
2014-12-08 13:42 ` [PATCH 06/12] fs: efivar: switch to standard list implementation Lucas Stach
2014-12-08 13:42 ` [PATCH 07/12] fs: efivar: move variable discovery into probe Lucas Stach
2014-12-08 13:42 ` [PATCH 08/12] lib: add wchar strdup Lucas Stach
2014-12-08 13:42 ` Lucas Stach [this message]
2014-12-08 13:42 ` [PATCH 10/12] fs: efivars: don't store attributes in file Lucas Stach
2014-12-08 13:42 ` [PATCH 11/12] fs: efivars: implement write support Lucas Stach
2014-12-08 13:42 ` [PATCH 12/12] efi: mount efivarfs by default if enabled Lucas Stach
2014-12-09  8:59 ` [PATCH 01/12] efi: add function to determine type of device path 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=1418046159-29843-9-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