[coreboot-gerrit] New patch to review for filo: fs: get rid of grub_open / grub_read / grub_seek / grub_close indirection

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14577

-gerrit

commit 8df28362f653e736b1e66f46d999221a60a6c7c9
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Mon May 2 18:04:18 2016 -0700

    fs: get rid of grub_open / grub_read / grub_seek / grub_close indirection
    
    Change-Id: Ib1251d8b3c057f8f9a28e1986ae69efba44979ee
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 fs/filesys.h     | 5 -----
 fs/fsys_cramfs.c | 2 +-
 fs/fsys_ext2fs.c | 2 +-
 fs/fsys_minix.c  | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/fs/filesys.h b/fs/filesys.h
index fea1d35..747e69e 100644
--- a/fs/filesys.h
+++ b/fs/filesys.h
@@ -104,11 +104,6 @@ typedef enum
 
 extern grub_error_t errnum;
 
-#define grub_open file_open
-#define grub_read file_read
-#define grub_seek file_seek
-#define grub_close file_close
-
 /* instrumentation variables */
 /* (Not used in FILO) */
 extern void (*disk_read_hook) (int, int, int);
diff --git a/fs/fsys_cramfs.c b/fs/fsys_cramfs.c
index 7866cdb..8bc42d4 100644
--- a/fs/fsys_cramfs.c
+++ b/fs/fsys_cramfs.c
@@ -339,7 +339,7 @@ cramfs_dir(char *dirname)
 			linkbuf[filemax + len] = '\0';
 
 			/* Read the necessary blocks, and reset the file pointer. */
-			len = grub_read(linkbuf, filemax);
+			len = file_read(linkbuf, filemax);
 			filepos = 0;
 			if (!len)
 				return 0;
diff --git a/fs/fsys_ext2fs.c b/fs/fsys_ext2fs.c
index 51b3faf..527c6f6 100644
--- a/fs/fsys_ext2fs.c
+++ b/fs/fsys_ext2fs.c
@@ -942,7 +942,7 @@ ext2fs_dir (char *dirname)
 
 	  /* Read the symlink data. 
 	   * Slow symlink is extents enabled
-	   * But since grub_read invokes ext2fs_read, nothing to change here
+	   * But since file_read invokes ext2fs_read, nothing to change here
 	   * */
 	  if (! ext2_is_fast_symlink ())
 	    {
diff --git a/fs/fsys_minix.c b/fs/fsys_minix.c
index f9b7519..6969ca6 100644
--- a/fs/fsys_minix.c
+++ b/fs/fsys_minix.c
@@ -381,7 +381,7 @@ minix_dir (char *dirname)
 	  linkbuf[filemax + len] = '\0';
 
 	  /* Read the necessary blocks, and reset the file pointer. */
-	  len = grub_read (linkbuf, filemax);
+	  len = file_read (linkbuf, filemax);
 	  filepos = 0;
 	  if (!len)
 	    return 0;