core:fs: Use a much better union structure in file structure

Remove the u1 and u2 union, and merge the related fileds as a group, and
then make a big union. Then we don't need to use u1 or u2 to reference
these fileds any more but use it directly just like there are no union
structures here:)

Signed-off-by: Liu Aleaxander <Aleaxander@gmail.com>

1 files changed, 12 insertions, 7 deletions

diff --git a/core/include/fs.h b/core/include/fs.h
index 35d46ed4..28b66793 100644
--- a/core/include/fs.h
+++ b/core/include/fs.h
@@ -86,13 +86,18 @@ struct open_file_t;
 struct file {
     struct fs_info *fs;
     union {
-	struct inode *inode;        /* the file-specific information */
-	struct open_file_t *open_file;
-    } u1;
-    union {
-	uint32_t offset;                /* for next read */
-	uint32_t file_len;
-    } u2;
+	/* For the new universal-path_lookup */
+	struct {
+	    struct inode *inode;        /* The file-specific information */
+	    uint32_t offset;            /* for next read */
+	};
+
+	/* For the old searhdir method */
+	struct {
+	    struct open_file_t *open_file;/* The fs-specific open file struct */
+	    uint32_t file_len;
+	};
+    };
 };